From ee93a441da21b62f151eaa83f2f6f91274bff684 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 13:51:49 +0200 Subject: [PATCH 01/27] Update dependabot.yml Update dependabot reviewee/assignee --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6dcf534..d607819 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,6 +6,6 @@ updates: interval: "daily" reviewers: - krns - - PKuebler + - NeroAzure assignees: - - PKuebler + - NeroAzure From a92b8585899e356791c1c8f9a8ac4bb5246ca8b6 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:39:37 +0200 Subject: [PATCH 02/27] add and test the workflow --- .github/workflows/imagebuild.yml | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/imagebuild.yml diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml new file mode 100644 index 0000000..850906a --- /dev/null +++ b/.github/workflows/imagebuild.yml @@ -0,0 +1,46 @@ +name: Build Image + +on: + push: + branch + # tags: + # - '*.*.*' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + # - + # name: Login to GitHub Container Registry + # uses: docker/login-action@v1 + # with: + # registry: ghcr.io + # username: ${{ github.repository_owner }} + # password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + # ghcr.io/user/app:1.0.0 + # ghcr.io/user/app:latest + tags: | + {{ GITHUB_REPOSITORY }}-test:latest + {{ GITHUB_REPOSITORY }}-test:{{ GITHUB_REF }} \ No newline at end of file From 8544ebbb16b36a37b61efe9f7df47d2dba18a91f Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:42:22 +0200 Subject: [PATCH 03/27] fix push value --- .github/workflows/imagebuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 850906a..a77a710 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -2,7 +2,8 @@ name: Build Image on: push: - branch + branches: + - '*' # tags: # - '*.*.*' From 5c898a8c0b5a7edab22d19458cc10a7932cc050d Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:43:23 +0200 Subject: [PATCH 04/27] build on push --- .github/workflows/imagebuild.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index a77a710..4856781 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -1,9 +1,6 @@ name: Build Image -on: - push: - branches: - - '*' +on: ['push'] # tags: # - '*.*.*' From 03250bb7be303b5f8fdb02c7e879f7117619c96e Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:45:31 +0200 Subject: [PATCH 05/27] add missing reference parameters --- .github/workflows/imagebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 4856781..aef0c67 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -40,5 +40,5 @@ jobs: # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest tags: | - {{ GITHUB_REPOSITORY }}-test:latest - {{ GITHUB_REPOSITORY }}-test:{{ GITHUB_REF }} \ No newline at end of file + ${{ GITHUB_REPOSITORY }}-test:latest + ${{ GITHUB_REPOSITORY }}-test:${{ GITHUB_REF }} \ No newline at end of file From 03aaaed2ed6a98fb73f28dd662a4c9126861a082 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:51:27 +0200 Subject: [PATCH 06/27] test if the environment variables have to be accessed through the github object --- .github/workflows/imagebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index aef0c67..b2247df 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -40,5 +40,5 @@ jobs: # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest tags: | - ${{ GITHUB_REPOSITORY }}-test:latest - ${{ GITHUB_REPOSITORY }}-test:${{ GITHUB_REF }} \ No newline at end of file + ${{ github.GITHUB_REPOSITORY }}-test:latest + ${{ github.GITHUB_REPOSITORY }}-test:${{ GITHUB_REF }} \ No newline at end of file From 491ff01d97894d071b9925a09ff270ab2843ae19 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:54:39 +0200 Subject: [PATCH 07/27] github object it is --- .github/workflows/imagebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index b2247df..6fe2edb 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -41,4 +41,4 @@ jobs: # ghcr.io/user/app:latest tags: | ${{ github.GITHUB_REPOSITORY }}-test:latest - ${{ github.GITHUB_REPOSITORY }}-test:${{ GITHUB_REF }} \ No newline at end of file + ${{ github.GITHUB_REPOSITORY }}-test:${{ github.GITHUB_REF }} \ No newline at end of file From 05367455b1371c51e7a1ee3840ba4411e4809abc Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 15:59:56 +0200 Subject: [PATCH 08/27] other syntax --- .github/workflows/imagebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 6fe2edb..34d4523 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -40,5 +40,5 @@ jobs: # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest tags: | - ${{ github.GITHUB_REPOSITORY }}-test:latest - ${{ github.GITHUB_REPOSITORY }}-test:${{ github.GITHUB_REF }} \ No newline at end of file + $GITHUB_REPOSITORY-test:latest + $GITHUB_REPOSITORY-test:$GITHUB_REF \ No newline at end of file From c52bd35c32046ad1369b267c1e97d4b1ce1ce41c Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 16:05:49 +0200 Subject: [PATCH 09/27] yet another syntax --- .github/workflows/imagebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 34d4523..3e0486d 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -40,5 +40,5 @@ jobs: # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest tags: | - $GITHUB_REPOSITORY-test:latest - $GITHUB_REPOSITORY-test:$GITHUB_REF \ No newline at end of file + ${GITHUB_REPOSITORY}-test:latest + ${GITHUB_REPOSITORY}-test:${GITHUB_REF} \ No newline at end of file From 383fad2b8102d5559e8ec607ccff7b1443b2aaf8 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 16:13:24 +0200 Subject: [PATCH 10/27] yet another syntax --- .github/workflows/imagebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 3e0486d..1e88e1a 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -40,5 +40,5 @@ jobs: # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest tags: | - ${GITHUB_REPOSITORY}-test:latest - ${GITHUB_REPOSITORY}-test:${GITHUB_REF} \ No newline at end of file + ${{ github.GITHUB_REPOSITORY }}-test:latest + ${{ $github.GITHUB_REPOSITORY }}-test:${{ github.GITHUB_REF }} \ No newline at end of file From 0aa362594a9fac2b61dc99bd1bfd469e4a0da7be Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 16:14:11 +0200 Subject: [PATCH 11/27] yet another syntax --- .github/workflows/imagebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 1e88e1a..6fe2edb 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -41,4 +41,4 @@ jobs: # ghcr.io/user/app:latest tags: | ${{ github.GITHUB_REPOSITORY }}-test:latest - ${{ $github.GITHUB_REPOSITORY }}-test:${{ github.GITHUB_REF }} \ No newline at end of file + ${{ github.GITHUB_REPOSITORY }}-test:${{ github.GITHUB_REF }} \ No newline at end of file From 18006b6b924d4f8b5f6322480eb0daa130148998 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 16:24:39 +0200 Subject: [PATCH 12/27] other variables --- .github/workflows/imagebuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 6fe2edb..90bb1c1 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -40,5 +40,5 @@ jobs: # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest tags: | - ${{ github.GITHUB_REPOSITORY }}-test:latest - ${{ github.GITHUB_REPOSITORY }}-test:${{ github.GITHUB_REF }} \ No newline at end of file + ${{ github.repository }}-test:latest + ${{ github.repository }}-test:${{ github.event.push.tags[0] }} \ No newline at end of file From 74bace8249bb78af200b22a3bdc6c4a6b12104a7 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 23 Jun 2021 16:27:32 +0200 Subject: [PATCH 13/27] debug event object --- .github/workflows/imagebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 90bb1c1..ab5c585 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -41,4 +41,4 @@ jobs: # ghcr.io/user/app:latest tags: | ${{ github.repository }}-test:latest - ${{ github.repository }}-test:${{ github.event.push.tags[0] }} \ No newline at end of file + ${{ github.repository }}-test:${{ join(github.event.push.tags, ', ') }} \ No newline at end of file From e04b6db2db53ad94737ff90c6ca48f88e603c4b6 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 08:42:02 +0200 Subject: [PATCH 14/27] debug event object --- .github/workflows/imagebuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index ab5c585..2f5d5d3 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -41,4 +41,4 @@ jobs: # ghcr.io/user/app:latest tags: | ${{ github.repository }}-test:latest - ${{ github.repository }}-test:${{ join(github.event.push.tags, ', ') }} \ No newline at end of file + ${{ github.repository }}-test:${{ join(github.event.push.branches.*.name, ', ') }} \ No newline at end of file From eae1de0db87efeb44a13a29117a1c6ca40e0065e Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 08:53:25 +0200 Subject: [PATCH 15/27] using docker metadata --- .github/workflows/imagebuild.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml index 2f5d5d3..b0627af 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/imagebuild.yml @@ -11,6 +11,20 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v3 + with: + # list of Docker images to use as base name for tags + images: | + neroazure/docker-laravel + # generate Docker tags based on the following events/attributes + tags: | + type=ref,event=branch + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -39,6 +53,4 @@ jobs: push: true # ghcr.io/user/app:1.0.0 # ghcr.io/user/app:latest - tags: | - ${{ github.repository }}-test:latest - ${{ github.repository }}-test:${{ join(github.event.push.branches.*.name, ', ') }} \ No newline at end of file + tags: ${{ steps.meta.outputs.tags }} \ No newline at end of file From 6ae3095b5f400df41584157fbdac8d0d8ad88f5c Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 09:06:59 +0200 Subject: [PATCH 16/27] trying to comply with buildx --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ed656d..28169bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,8 @@ COPY ./etc/service/ /etc/service/ RUN find /etc/service/ -name "run" -exec chmod -v +x {} \; # copy nginx config files -COPY ./etc/nginx/ /etc/nginx/ +COPY ./etc/nginx/conf.d/ /etc/nginx/conf.d/ +COPY ./etc/nginx/ngsinx.conf /etc/nginx/nginx.conf # copy php config files COPY ./usr/local/etc/php/ /usr/local/etc/php/ From 41c5faf8f010a1b42689df3139a7586e73a443bc Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 09:09:41 +0200 Subject: [PATCH 17/27] fix typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28169bf..c7d7674 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ RUN find /etc/service/ -name "run" -exec chmod -v +x {} \; # copy nginx config files COPY ./etc/nginx/conf.d/ /etc/nginx/conf.d/ -COPY ./etc/nginx/ngsinx.conf /etc/nginx/nginx.conf +COPY ./etc/nginx/nginx.conf /etc/nginx/nginx.conf # copy php config files COPY ./usr/local/etc/php/ /usr/local/etc/php/ From 7676fe7f1a936a62fed108d020837dd4d48d141e Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 10:00:34 +0200 Subject: [PATCH 18/27] rename workflow and make last changes for production use --- .../{imagebuild.yml => stableImageBuild.yml} | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) rename .github/workflows/{imagebuild.yml => stableImageBuild.yml} (71%) diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/stableImageBuild.yml similarity index 71% rename from .github/workflows/imagebuild.yml rename to .github/workflows/stableImageBuild.yml index b0627af..102f99b 100644 --- a/.github/workflows/imagebuild.yml +++ b/.github/workflows/stableImageBuild.yml @@ -1,8 +1,8 @@ -name: Build Image +name: Build stable image -on: ['push'] - # tags: - # - '*.*.*' +on: + tags: + - '*.*.*' jobs: docker: @@ -18,10 +18,12 @@ jobs: with: # list of Docker images to use as base name for tags images: | - neroazure/docker-laravel + sourceboat/docker-laravel + ghcr.io/sourceboat/docker-laravel + flavour: | + latest=true # generate Docker tags based on the following events/attributes tags: | - type=ref,event=branch type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} @@ -37,13 +39,13 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - # - - # name: Login to GitHub Container Registry - # uses: docker/login-action@v1 - # with: - # registry: ghcr.io - # username: ${{ github.repository_owner }} - # password: ${{ secrets.GITHUB_TOKEN }} + - + name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 @@ -51,6 +53,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: true - # ghcr.io/user/app:1.0.0 - # ghcr.io/user/app:latest tags: ${{ steps.meta.outputs.tags }} \ No newline at end of file From 93025d4fc78705735cb9d1c523a6a7c0f223003d Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 10:00:54 +0200 Subject: [PATCH 19/27] create workflow for edge image --- .github/workflows/edgeImageBuild.yml | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/edgeImageBuild.yml diff --git a/.github/workflows/edgeImageBuild.yml b/.github/workflows/edgeImageBuild.yml new file mode 100644 index 0000000..8d1d75d --- /dev/null +++ b/.github/workflows/edgeImageBuild.yml @@ -0,0 +1,43 @@ +name: Build edge image + +on: + push: + branches: + - develop + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: | + sourceboat/docker-laravel:edge + ghcr.io/sourceboat/docker-laravel:edge \ No newline at end of file From 7db92435da949b27503a297fa6c2947732b8ffff Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Thu, 24 Jun 2021 10:09:47 +0200 Subject: [PATCH 20/27] fix syntax --- .github/workflows/stableImageBuild.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stableImageBuild.yml b/.github/workflows/stableImageBuild.yml index 102f99b..d1ced52 100644 --- a/.github/workflows/stableImageBuild.yml +++ b/.github/workflows/stableImageBuild.yml @@ -1,8 +1,9 @@ name: Build stable image on: - tags: - - '*.*.*' + push: + tags: + - '*.*.*' jobs: docker: From b8c498f1095f8210def69cf4e3a5e752770aad1b Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Mon, 12 Jul 2021 10:36:47 +0200 Subject: [PATCH 21/27] add test workflow see #59 --- .github/workflows/testImageBuild.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/testImageBuild.yml diff --git a/.github/workflows/testImageBuild.yml b/.github/workflows/testImageBuild.yml new file mode 100644 index 0000000..5b68944 --- /dev/null +++ b/.github/workflows/testImageBuild.yml @@ -0,0 +1,27 @@ +name: Build test image + +on: [pull_request] + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: false + tags: | + sourceboat/docker-laravel:test + ghcr.io/sourceboat/docker-laravel:test \ No newline at end of file From b1ca62c95cf31f3a8e3f267188854373f6e02144 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Mon, 19 Jul 2021 17:43:05 +0200 Subject: [PATCH 22/27] remove arm target and second tag for test build see #59 --- .github/workflows/testImageBuild.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testImageBuild.yml b/.github/workflows/testImageBuild.yml index 5b68944..9f3149a 100644 --- a/.github/workflows/testImageBuild.yml +++ b/.github/workflows/testImageBuild.yml @@ -20,8 +20,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: false tags: | - sourceboat/docker-laravel:test - ghcr.io/sourceboat/docker-laravel:test \ No newline at end of file + sourceboat/docker-laravel:test \ No newline at end of file From 7b963a46aebd5474f8fe6844c2c629d1a51807eb Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Mon, 19 Jul 2021 17:43:44 +0200 Subject: [PATCH 23/27] remove github as registry target see #59 --- .github/workflows/stableImageBuild.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/stableImageBuild.yml b/.github/workflows/stableImageBuild.yml index d1ced52..aa1d9da 100644 --- a/.github/workflows/stableImageBuild.yml +++ b/.github/workflows/stableImageBuild.yml @@ -20,7 +20,6 @@ jobs: # list of Docker images to use as base name for tags images: | sourceboat/docker-laravel - ghcr.io/sourceboat/docker-laravel flavour: | latest=true # generate Docker tags based on the following events/attributes @@ -40,13 +39,6 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 From 1d83951b4811f5bf92bcaaa743d6f2bb7098c649 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Mon, 26 Jul 2021 15:31:13 +0200 Subject: [PATCH 24/27] remove github as registry target for edge build see #59 --- .github/workflows/edgeImageBuild.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/edgeImageBuild.yml b/.github/workflows/edgeImageBuild.yml index 8d1d75d..8ed32df 100644 --- a/.github/workflows/edgeImageBuild.yml +++ b/.github/workflows/edgeImageBuild.yml @@ -24,13 +24,6 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 @@ -39,5 +32,4 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: | - sourceboat/docker-laravel:edge - ghcr.io/sourceboat/docker-laravel:edge \ No newline at end of file + sourceboat/docker-laravel:edge \ No newline at end of file From 92be6afd098b3644e377e4c0055e65d92231f3bb Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Mon, 26 Jul 2021 16:05:50 +0200 Subject: [PATCH 25/27] use github actions for testing the container see #59 --- .github/workflows/testImageBuild.yml | 16 ++-------------- docker-compose.test.yml | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/testImageBuild.yml b/.github/workflows/testImageBuild.yml index 9f3149a..1de0a91 100644 --- a/.github/workflows/testImageBuild.yml +++ b/.github/workflows/testImageBuild.yml @@ -10,17 +10,5 @@ jobs: name: Checkout uses: actions/checkout@v2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: . - platforms: linux/amd64 - push: false - tags: | - sourceboat/docker-laravel:test \ No newline at end of file + name: Run tests + run: docker-compose -f docker-compose.test.yml run test \ No newline at end of file diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 9298d4c..963a711 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,6 +1,6 @@ version: '3.7' services: - sut: + test: build: . command: /root/test/test-command.sh environment: From 32c6dfef55fcf92eef315781547554f0e98835ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jul 2021 14:25:07 +0000 Subject: [PATCH 26/27] Bump php from 8.0.7-fpm-alpine to 8.0.8-fpm-alpine Bumps php from 8.0.7-fpm-alpine to 8.0.8-fpm-alpine. --- updated-dependencies: - dependency-name: php dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7d7674..92a54c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.7-fpm-alpine +FROM php:8.0.8-fpm-alpine ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \ PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \ From 36cd4f8c5187c081da11e78a30ca08cbc2f788da Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Wed, 28 Jul 2021 11:15:21 +0200 Subject: [PATCH 27/27] update credits --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index baa419f..30c04c2 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ Check [releases](https://github.com/sourceboat/docker-laravel/releases) for all - [Phil-Bastian Berndt](https://github.com/pehbehbeh) - [Philipp Kübler](https://github.com/PKuebler) +- [Kevin Buchholz](https://github.com/NeroAzure) - [All Contributors](https://github.com/sourceboat/docker-laravel/graphs/contributors) ## License