Skip to content

Commit 46e0167

Browse files
committed
fix: base image, disable cache for a clean build
1 parent af1e83b commit 46e0167

10 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/publish.5.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ jobs:
5959
uses: docker/build-push-action@v5
6060
with:
6161
platforms: linux/amd64
62-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
62+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
6363
cache-to: type=inline
6464
context: .
6565
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
6666
build-args: |
67-
BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
67+
BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
6868
tags: |
6969
chialab/php:${{ matrix.version }}${{ matrix.flavor }}
7070
ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}

.github/workflows/publish.7.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ jobs:
5959
uses: docker/build-push-action@v5
6060
with:
6161
platforms: linux/amd64,linux/arm64
62-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
62+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
6363
cache-to: type=inline
6464
context: .
6565
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
6666
build-args: |
67-
BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
67+
BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
6868
tags: |
6969
chialab/php:${{ matrix.version }}${{ matrix.flavor }}
7070
ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}

.github/workflows/publish.8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ jobs:
5454
uses: docker/build-push-action@v5
5555
with:
5656
platforms: linux/amd64,linux/arm64
57-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
57+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
5858
cache-to: type=inline
5959
context: .
6060
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
6161
build-args: |
62-
BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
62+
BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
6363
tags: |
6464
chialab/php:${{ matrix.version }}${{ matrix.flavor }}
6565
ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}

.github/workflows/publish.compat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: docker/build-push-action@v5
5656
with:
5757
platforms: linux/amd64
58-
cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
58+
# cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
5959
cache-to: type=inline
6060
context: ./compat
6161
file: ${{ format('compat/{0}.{1}{2}', 'Dockerfile', matrix.version, matrix.flavor) }}

.github/workflows/publish.latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ jobs:
5353
uses: docker/build-push-action@v5
5454
with:
5555
platforms: linux/amd64,linux/arm64
56-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
56+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
5757
cache-to: type=inline
5858
context: .
5959
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
6060
build-args: |
61-
BASE_IMAGE=chialab/php:${{ matrix.version }}
61+
BASE_IMAGE=php:${{ matrix.version }}
6262
tags: |
6363
chialab/php:${{ matrix.version }}
6464
ghcr.io/chialab/php:${{ matrix.version }}

.github/workflows/test.5.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
- name: Build image for testing
4242
uses: docker/build-push-action@v5
4343
with:
44-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
44+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
4545
cache-to: type=inline
4646
context: .
4747
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
4848
build-args: |
49-
BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
49+
BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
5050
tags: localhost:5000/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
5151
push: true
5252

.github/workflows/test.7.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
- name: Build image for testing
4242
uses: docker/build-push-action@v5
4343
with:
44-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
44+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
4545
cache-to: type=inline
4646
context: .
4747
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
4848
build-args: |
49-
BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
49+
BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
5050
tags: localhost:5000/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
5151
push: true
5252

.github/workflows/test.8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
- name: Build image for testing
3737
uses: docker/build-push-action@v5
3838
with:
39-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
39+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
4040
cache-to: type=inline
4141
context: .
4242
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
4343
build-args: |
44-
BASE_IMAGE=chialab/php:${{ matrix.version }}${{ matrix.flavor }}
44+
BASE_IMAGE=php:${{ matrix.version }}${{ matrix.flavor }}
4545
tags: localhost:5000/chialab/php:${{ matrix.version }}${{ matrix.flavor }}
4646
push: true
4747

.github/workflows/test.compat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Build image for testing
3737
uses: docker/build-push-action@v5
3838
with:
39-
cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
39+
# cache-from: type=registry,ref=ghcr.io/chialab/php-compat:${{ matrix.version }}${{ matrix.flavor }}
4040
cache-to: type=inline
4141
context: ./compat
4242
file: ${{ format('compat/{0}.{1}{2}', 'Dockerfile', matrix.version, matrix.flavor) }}

.github/workflows/test.latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
- name: Build image for testing
3636
uses: docker/build-push-action@v5
3737
with:
38-
cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
38+
# cache-from: type=registry,ref=ghcr.io/chialab/php:${{ matrix.version }}
3939
cache-to: type=inline
4040
context: .
4141
file: ${{ ((contains(matrix.flavor, 'alpine') || matrix.version == 'alpine') && 'Dockerfile.alpine') || 'Dockerfile' }}
4242
build-args: |
43-
BASE_IMAGE=chialab/php:${{ matrix.version }}
43+
BASE_IMAGE=php:${{ matrix.version }}
4444
tags: localhost:5000/chialab/php:${{ matrix.version }}
4545
push: true
4646

0 commit comments

Comments
 (0)