Remove docker socket debug step and unneeded sudo

Jobs run as root in the job container; the earlier permission errors
were SELinux denials on the mounted podman socket, fixed in the runner
config with --security-opt label=disable.
This commit is contained in:
2026-06-12 11:58:30 -04:00
parent 776d06963b
commit dd8f006d3f
+9 -20
View File
@@ -16,39 +16,28 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Debug docker socket
run: |
id
sudo id || true
ls -la /var/run/docker.sock /run/user 2>&1 || true
sudo ls -laL /var/run/docker.sock 2>&1 || true
findmnt /var/run/docker.sock 2>&1 || true
env | grep -iE 'docker|container|podman' || true
sudo docker version 2>&1 || true
docker version 2>&1 || true
- name: Log in to registry - name: Log in to registry
run: | run: |
echo "${{ secrets.REGISTRY_TOKEN }}" \ echo "${{ secrets.REGISTRY_TOKEN }}" \
| sudo docker login -u "${{ secrets.REGISTRY_USER }}" --password-stdin git.weaselab.dev | docker login -u "${{ secrets.REGISTRY_USER }}" --password-stdin git.weaselab.dev
- name: Build and push image if changed - name: Build and push image if changed
run: | run: |
image=git.weaselab.dev/weaselab/conflict-set-ci image=git.weaselab.dev/weaselab/conflict-set-ci
tag="$(sha256sum Dockerfile .pre-commit-config.yaml | sha256sum | cut -c 1-16)-${{ matrix.arch }}" tag="$(sha256sum Dockerfile .pre-commit-config.yaml | sha256sum | cut -c 1-16)-${{ matrix.arch }}"
latest=latest-${{ matrix.arch }} latest=latest-${{ matrix.arch }}
if sudo docker manifest inspect "$image:$tag" > /dev/null 2>&1; then if docker manifest inspect "$image:$tag" > /dev/null 2>&1; then
if [ "$(sudo docker manifest inspect "$image:$tag")" = "$(sudo docker manifest inspect "$image:$latest" 2> /dev/null)" ]; then if [ "$(docker manifest inspect "$image:$tag")" = "$(docker manifest inspect "$image:$latest" 2> /dev/null)" ]; then
echo "$image:$latest is up to date" echo "$image:$latest is up to date"
else else
sudo docker pull "$image:$tag" docker pull "$image:$tag"
sudo docker tag "$image:$tag" "$image:$latest" docker tag "$image:$tag" "$image:$latest"
sudo docker push "$image:$latest" docker push "$image:$latest"
fi fi
else else
sudo docker build -t "$image:$tag" -t "$image:$latest" . docker build -t "$image:$tag" -t "$image:$latest" .
sudo docker push "$image:$tag" docker push "$image:$tag"
sudo docker push "$image:$latest" docker push "$image:$latest"
fi fi
pre-commit: pre-commit: