Merge pull request #58 from WyriHaximusNet/use-buildkit

Use buildkit to improve performance of image (building)
WyriHaximusNet · Jan 23, 2020 · 2ffb119 · 2ffb119
2 parents f1570ec + 03c2242
commit 2ffb119
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: Continuous Integration
 env:
   DOCKER_IMAGE: wyrihaximusnet/php
+  DOCKER_BUILDKIT: 1
 on:
   push:
     branches:
@@ -36,7 +37,7 @@ jobs:
         if: matrix.type == 'zts'
       - run: ./build-php.sh cli nts ${{ matrix.php }} ${{ matrix.alpine }}
         if: matrix.type == 'nts'
-      - run: cat ./docker-image/build-${{ matrix.type }}.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .ContainerConfig.Env 7}}' %
+      - run: cat ./docker-image/build-${{ matrix.type }}.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .Config.Env 7}}' %
       - run: docker save "${DOCKER_IMAGE}" -o ./docker-image/docker_image-${{ matrix.type }}.tar
       - run: docker images
       - uses: actions/upload-artifact@master

diff --git a/Dockerfile-nts b/Dockerfile-nts
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:experimental
 FROM php:7.4-cli-alpine3.11 AS build-uv
 RUN apk update && \
     apk add --no-cache $PHPIZE_DEPS git libuv-dev && \

diff --git a/Dockerfile-zts b/Dockerfile-zts
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:experimental
 FROM php:7.4-zts-alpine3.11 AS build-parallel
 RUN apk update && \
     apk add --no-cache $PHPIZE_DEPS git