Skip to content

Commit 47428ba

Browse files
committed
Removing buildx
1 parent fd69faf commit 47428ba

1 file changed

Lines changed: 7 additions & 29 deletions

File tree

.github/workflows/ci-cd.yml

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: CI/CD
22

33
on: [push, workflow_dispatch]
44

5+
env:
6+
DOCKER_BUILDKIT: 1
7+
58
jobs:
69
build:
710
name: Build
@@ -15,48 +18,23 @@ jobs:
1518
- name: Checkout code
1619
uses: actions/checkout@v2
1720

18-
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v1
20-
21-
- name: Cache Docker layers
22-
uses: actions/cache@v2
23-
with:
24-
path: /tmp/.buildx-cache
25-
key: docker-buildx-${{ matrix.version }}${{ matrix.type }}-${{ github.sha }}
26-
restore-keys: docker-buildx-${{ matrix.version }}${{ matrix.type }}-
27-
2821
- name: Build
2922
run: |
30-
docker buildx build \
31-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}${{ matrix.type }} \
32-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}${{ matrix.type }} \
33-
--output type=docker \
23+
docker build \
3424
--tag kooldev/php:${{ matrix.version }}${{ matrix.type }} \
3525
${{ matrix.version }}${{ matrix.type }}
3626
37-
docker buildx build \
38-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-wkhtmltopdf${{ matrix.type }} \
39-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}${{ matrix.type }} \
40-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-wkhtmltopdf${{ matrix.type }} \
41-
--output type=docker \
27+
docker build \
4228
--tag kooldev/php:${{ matrix.version }}-wkhtmltopdf${{ matrix.type }} \
4329
${{ matrix.version }}-wkhtmltopdf${{ matrix.type }}
4430
4531
- name: Build (nginx)
4632
run: |
47-
docker buildx build \
48-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nginx${{ matrix.type }} \
49-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}${{ matrix.type }} \
50-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-nginx${{ matrix.type }} \
51-
--output type=docker \
33+
docker build \
5234
--tag kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} \
5335
${{ matrix.version }}-nginx${{ matrix.type }}
5436
55-
docker buildx build \
56-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }} \
57-
--cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }}-nginx${{ matrix.type }} \
58-
--cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }} \
59-
--output type=docker \
37+
docker build \
6038
--tag kooldev/php:${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }} \
6139
${{ matrix.version }}-nginx-wkhtmltopdf${{ matrix.type }}
6240

0 commit comments

Comments
 (0)