Skip to content

Commit 11c3dad

Browse files
committed
enable buildkit
1 parent 17d3e1c commit 11c3dad

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

.circleci/config.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,13 @@ jobs:
219219
- store_artifacts:
220220
path: ./tmp/clair
221221
build-http:
222-
machine: true
222+
docker:
223+
- image: docker:18.09
223224
steps:
225+
- run: apk add bash make
224226
- checkout
227+
- setup_remote_docker:
228+
version: 18.09.3
225229
- run: make build-http
226230
- run: cat ./tmp/build-http.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .ContainerConfig.Env 1}}' %
227231
- run: docker save usabillabv/php -o ./tmp/usabillabv_php-http.tar
@@ -231,9 +235,13 @@ jobs:
231235
- usabillabv_php-http.tar
232236
- build-http.tags
233237
build-prometheus-exporter-file:
234-
machine: true
238+
docker:
239+
- image: docker:18.09
235240
steps:
241+
- run: apk add bash make
236242
- checkout
243+
- setup_remote_docker:
244+
version: 18.09.3
237245
- run: make build-prometheus-exporter-file
238246
- run: cat ./tmp/build-prometheus-exporter-file.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .ContainerConfig.Env 1}}' %
239247
- run: docker save usabillabv/php -o ./tmp/usabillabv_php-prometheus-exporter-file.tar
@@ -243,9 +251,13 @@ jobs:
243251
- usabillabv_php-prometheus-exporter-file.tar
244252
- build-prometheus-exporter-file.tags
245253
build-fpm:
246-
machine: true
254+
docker:
255+
- image: docker:18.09
247256
steps:
257+
- run: apk add bash make
248258
- checkout
259+
- setup_remote_docker:
260+
version: 18.09.3
249261
- run: make build-fpm
250262
- run: cat ./tmp/build-fpm.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .ContainerConfig.Env 8}}' %
251263
- run: docker save usabillabv/php -o ./tmp/usabillabv_php-fpm.tar
@@ -255,9 +267,13 @@ jobs:
255267
- usabillabv_php-fpm.tar
256268
- build-fpm.tags
257269
build-cli:
258-
machine: true
270+
docker:
271+
- image: docker:18.09
259272
steps:
273+
- run: apk add bash make
260274
- checkout
275+
- setup_remote_docker:
276+
version: 18.09.3
261277
- run: make build-cli
262278
- run: cat ./tmp/build-cli.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .ContainerConfig.Env 7}}' %
263279
- run: docker save usabillabv/php -o ./tmp/usabillabv_php-cli.tar

build-nginx.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -eEuo pipefail
44

5+
export DOCKER_BUILDKIT=1
6+
57
declare -r IMAGE="http"
68

79
declare -r VERSION_NGINX=$1

build-php.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -eEuo pipefail
44

5+
export DOCKER_BUILDKIT=1
6+
57
declare -r IMAGE=$1
68

79
declare -r VERSION_PHP=$2

build-prometheus-exporter-file.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -eEuo pipefail
44

5+
export DOCKER_BUILDKIT=1
6+
57
declare -r IMAGE="prometheus-exporter-file"
68

79
declare -r DOCKER_FILE="http"

0 commit comments

Comments
 (0)