Skip to content

mz507: normalize images #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzihlmann merged 10 commits into from
Mar 25, 2026
Merged

mz507: normalize images #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
61986fa
mz507: normalize via skopeo
mzihlmann Mar 9, 2026
e35ee03
mz507: make normalization explicit
mzihlmann Mar 9, 2026
c458414
mz507: forward DOCKER_HOST to skopeo
mzihlmann Mar 11, 2026
c91fc3b
mz507: push docker builds
mzihlmann Mar 12, 2026
a0f2a43
mz507: buildkit snapshotter now pollutes atime
mzihlmann Mar 11, 2026
06b318d
mz507: make push the default
mzihlmann Mar 12, 2026
523fadd
mz507: avoid nameclash
mzihlmann Mar 22, 2026
09e95bf
mz507: drop crane
mzihlmann Mar 22, 2026
13a7bbb
mz507: skopeo pull is sufficient
mzihlmann Mar 22, 2026
4b671cd
mz507: drop legacy code
mzihlmann Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions .github/workflows/integration-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,12 @@ jobs:
persist-credentials: false

- uses: docker/setup-docker-action@1a6edb0ba9ac496f6850236981f15d8f9a82254d # v5.0.0
id: setup-docker
with:
version: 29.2.1
daemon-config: |
{
"features": {
"containerd-snapshotter": false
}
}

- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

- run: make install-diffoci install-crane k3s-setup
- run: sudo apt install -y libgpgme-dev libassuan-dev libbtrfs-dev pkg-config # skopeo dependencies
- run: make install-diffoci install-skopeo k3s-setup
- run: make ${{ matrix.make-target }}
env:
DOCKER_HOST: ${{ steps.setup-docker.outputs.sock }}
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ install-diffoci:
go mod vendor && \
go install

.PHONY: install-crane
install-crane:
@ GOFLAGS="" go install github.com/google/go-containerregistry/cmd/crane@latest
.PHONY: install-skopeo
install-skopeo:
@ GOFLAGS="" go install github.com/containers/skopeo/cmd/skopeo@latest

.PHONY: k3s-setup
k3s-setup:
Expand Down
16 changes: 14 additions & 2 deletions integration/dockerfiles/Dockerfile_test_issue_mz155
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,20 @@ RUN stat /tmp/testdir \

# assert that snapshot did not touch atime. we can't use diffoci for that,
# as buildkit does not snapshot atime, they are only present during build.
RUN [ $(stat -c %X /tmp/testdir) -eq $(date -d '2000-01-01' +%s) ] \
&& [ $(stat -c %X /tmp/testdir) -eq $(date -d '2000-01-01' +%s) ]
# starting with docker v29 buildkit, when using containerd snapshotter,
# snapshotter will modifity atime on snapshot and can therefore no longer be tested.
RUN if ls -l /proc/1/exe | grep -q '/kaniko/executor'; then \
if [ $(stat -c %X /tmp/testdir) -ne $(date -d '2000-01-01' +%s) ]; then \
echo "FAIL: atime changed on /tmp/testdir"; \
exit 1; \
fi; \
if [ $(stat -c %X /tmp/testdir/file.txt) -ne $(date -d '2000-01-01' +%s) ]; then \
echo "FAIL: atime changed /tmp/testdir/file.txt"; \
exit 1; \
fi; \
else \
echo "PID1 is not Kaniko, skipping check"; \
fi

FROM debian:12.10 AS second-image

Expand Down
8 changes: 8 additions & 0 deletions integration/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,13 @@ func (d *DockerFileBuilder) BuildDockerImage(t *testing.T, imageRepo, dockerfile
return fmt.Errorf("failed to build image %s with docker command \"%s\": %w %s", dockerImage, dockerCmd.Args, err, string(out))
}
t.Logf("Build image for Dockerfile %s as %s. docker build output: %s \n", dockerfile, dockerImage, out)
// mz507: push is kept as a separate step because Dockerfile_test_issue_519
// still uses legacy builder and not buildkit
pushCmd := exec.Command("docker", "push", dockerImage)
out, err = RunCommandWithoutTest(pushCmd)
if err != nil {
return fmt.Errorf("failed to push image %s with docker command \"%s\": %w %s", dockerImage, pushCmd.Args, err, string(out))
}
return nil
}

Expand Down Expand Up @@ -614,6 +621,7 @@ func (d *DockerFileBuilder) buildRelativePathsImage(logf logger, imageRepo, dock
dockerCmd := exec.Command("docker",
[]string{
"build",
"--push",
"-t", dockerImage,
"-f", dockerfile,
"./context",
Expand Down
Loading
Loading