From 49f0ea697ed9fe2386937ef6809e648b1ece9aed Mon Sep 17 00:00:00 2001 From: Shin <2082119+shinsenter@users.noreply.github.com> Date: Sat, 10 Aug 2024 21:43:24 +0900 Subject: [PATCH 1/2] Simplify Dockerfile --- Dockerfile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0cbb001f..ae089a8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,6 @@ -FROM bash AS build - -COPY install-php-extensions /tmp/install-php-extensions -RUN chmod +x /tmp/install-php-extensions - FROM scratch -LABEL org.opencontainers.image.source="https://github.com/mlocati/docker-php-extension-installer" \ - org.opencontainers.image.licenses="MIT" +LABEL org.opencontainers.image.source="https://github.com/mlocati/docker-php-extension-installer" +LABEL org.opencontainers.image.licenses="MIT" -COPY --from=build /tmp/install-php-extensions /usr/bin/install-php-extensions +COPY --chmod=755 install-php-extensions /usr/bin/install-php-extensions From 0b22ada13b12bc540a6d971181b9ec36f1c12552 Mon Sep 17 00:00:00 2001 From: Shin <2082119+shinsenter@users.noreply.github.com> Date: Sat, 10 Aug 2024 22:30:25 +0900 Subject: [PATCH 2/2] Update test-dockerfile.yml --- .github/workflows/test-dockerfile.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-dockerfile.yml b/.github/workflows/test-dockerfile.yml index 31c71a67..59fb05e1 100644 --- a/.github/workflows/test-dockerfile.yml +++ b/.github/workflows/test-dockerfile.yml @@ -22,11 +22,16 @@ jobs: run: docker save --output /tmp/image.tar test:latest - name: Extract layer - run: tar -C /tmp -x -f /tmp/image.tar --wildcards '*layer.tar' --strip-components=1 + run: | + tar -C /tmp -x -f /tmp/image.tar --strip-components=1 + if [ ! -d /tmp/sha256 ]; then + echo 'Cannot extract docker archive.' + exit 1 + fi - name: Check layer contents run: | - ENTRY="$(tar -v -t -f /tmp/layer.tar --wildcards '*bin/install-php-extensions')" + ENTRY="$(find /tmp/sha256 -type f -exec tar -vtf {} \; 2>/dev/null | grep install-php-extensions)" if [ -z "$ENTRY" ]; then echo 'File not found' exit 1