From 882955485a8f50e1ed904e4a0a8d4f0831c23337 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:15:14 +0200 Subject: [PATCH 01/17] dfgd --- .gitea/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9166e2c..07ae95e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -83,3 +83,5 @@ jobs: Job: ${{ github.action }} Status: ${{ job.status }} Source: ${{ github.head_ref }} + + # sdfgsd -- 2.43.0 From 0037ebcd681b269ec7f4c5e70a669b16f09a7f71 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:16:40 +0200 Subject: [PATCH 02/17] ff --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 07ae95e..2603c9c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -84,4 +84,4 @@ jobs: Status: ${{ job.status }} Source: ${{ github.head_ref }} - # sdfgsd + # sdfgsdsdfsd -- 2.43.0 From b8db3663299a1698feaee45883909e779307af4a Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:19:48 +0200 Subject: [PATCH 03/17] ci: test git command --- .gitea/workflows/build.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 2603c9c..1cd7120 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -59,7 +59,7 @@ jobs: echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT - name: Extract branch name shell: bash - run: echo "REPO_BRANCH=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT + run: echo "REPO_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT id: extract_branch - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v6 @@ -83,5 +83,3 @@ jobs: Job: ${{ github.action }} Status: ${{ job.status }} Source: ${{ github.head_ref }} - - # sdfgsdsdfsd -- 2.43.0 From e8132c6697d2fb697f93470e730990d4c66a169b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:22:38 +0200 Subject: [PATCH 04/17] dfgds --- .gitea/workflows/build.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1cd7120..f037260 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -57,17 +57,13 @@ jobs: id: meta run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT - - name: Extract branch name - shell: bash - run: echo "REPO_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT - id: extract_branch - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v6 with: context: . file: ./Dockerfile push: true - tags: "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:latest,registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.extract_branch.outputs.REPO_BRANCH }}" + tags: "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:latest,registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:${{ env.GITHUB_HEAD_REF }}" - name: Send notification uses: dawidd6/action-send-mail@v3 if: failure() -- 2.43.0 From b70cbc87d7e47eec5f2a1f08daff16dc2752bc42 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:26:13 +0200 Subject: [PATCH 05/17] fff --- .gitea/workflows/build.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f037260..2b1fbed 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -57,13 +57,17 @@ jobs: id: meta run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT + - name: Extract branch name + shell: bash + run: echo $GITHUB_HEAD_REF | tr -cd '[:alnum:]' | sed s/^/REPO_BRANCH=/g >> $GITHUB_OUTPUT + id: extract_branch - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v6 with: context: . file: ./Dockerfile push: true - tags: "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:latest,registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:${{ env.GITHUB_HEAD_REF }}" + tags: "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:latest,registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.extract_branch.outputs.REPO_BRANCH }}" - name: Send notification uses: dawidd6/action-send-mail@v3 if: failure() -- 2.43.0 From 1239fcb050dc4ec2bea73de66ecd4d62e9c73cb4 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:31:34 +0200 Subject: [PATCH 06/17] ddd --- .gitea/workflows/build.yaml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 2b1fbed..a6c374e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,13 +1,15 @@ name: "lint, build and push" +# https://docs.docker.com/build/ci/github-actions/manage-tags-labels/ on: schedule: - - cron: "32 17 * * SUN" + - cron: "0 10 * * *" push: - branches: [ master ] + branches: + - "**" + tags: + - "v*.*.*" pull_request: -# Variables: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#default-environment-variables + https://forgejo.org/docs/latest/user/actions/#env-1 - jobs: lint: steps: @@ -46,6 +48,14 @@ jobs: needs: [gitleaks, hadolint] # shellcheck steps: - uses: https://github.com/actions/checkout@v4 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + # generate Docker tags based on the following events/attributes + tags: | + type=ref,event=branch + type=ref,event=pr - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 # - name: Login to Docker Hub @@ -67,7 +77,7 @@ jobs: context: . file: ./Dockerfile push: true - tags: "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:latest,registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.extract_branch.outputs.REPO_BRANCH }}" + tags: ${{ steps.meta.outputs.tags }} - name: Send notification uses: dawidd6/action-send-mail@v3 if: failure() -- 2.43.0 From d0ef83c8f7c6e2c8ac1a0e135b0905dc63571ced Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:31:59 +0200 Subject: [PATCH 07/17] ff --- .gitea/workflows/build.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a6c374e..7ab850f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -3,11 +3,6 @@ name: "lint, build and push" on: schedule: - cron: "0 10 * * *" - push: - branches: - - "**" - tags: - - "v*.*.*" pull_request: jobs: -- 2.43.0 From c70b9afedd61f07b0925e00f0db85bddc590bb8e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:32:18 +0200 Subject: [PATCH 08/17] ff --- .gitea/workflows/build.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7ab850f..8ed65e2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,8 +2,9 @@ name: "lint, build and push" # https://docs.docker.com/build/ci/github-actions/manage-tags-labels/ on: schedule: - - cron: "0 10 * * *" - pull_request: + - cron: "32 17 * * SUN" + push: + branches: [ master ] jobs: lint: -- 2.43.0 From 2ee1023caf27daf9e054c8b3012bb8c0be4995b8 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:32:39 +0200 Subject: [PATCH 09/17] sdfgd --- .gitea/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8ed65e2..a8f3cb2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -89,3 +89,6 @@ jobs: Job: ${{ github.action }} Status: ${{ job.status }} Source: ${{ github.head_ref }} + + +# todo -- 2.43.0 From 5bea33bdd9adae7f3ea290d9a7ae023c6630a245 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:33:13 +0200 Subject: [PATCH 10/17] dfd --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a8f3cb2..8ec91c0 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -5,6 +5,7 @@ on: - cron: "32 17 * * SUN" push: branches: [ master ] + pull_request: jobs: lint: -- 2.43.0 From 3d335b2768bca9c1fe637a4abf6c05fc8980ee3c Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:33:49 +0200 Subject: [PATCH 11/17] ff --- .gitea/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8ec91c0..08cb5a7 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -44,7 +44,8 @@ jobs: build: needs: [gitleaks, hadolint] # shellcheck steps: - - uses: https://github.com/actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 - name: Docker meta id: meta uses: docker/metadata-action@v5 -- 2.43.0 From 1892312bb95fe0c2609e3800f0eb88469b2d2fd5 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:36:16 +0200 Subject: [PATCH 12/17] gfhdfg --- .gitea/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 08cb5a7..f7df2f4 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -54,7 +54,9 @@ jobs: tags: | type=ref,event=branch type=ref,event=pr - - name: Set up Docker Buildx + images: | + "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}" + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 # - name: Login to Docker Hub # uses: docker/login-action@v3 -- 2.43.0 From 8c216105e3de01e7b66ca8c9cc5c683bf385cfbd Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:36:46 +0200 Subject: [PATCH 13/17] dfgdsf --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f7df2f4..69ca045 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -95,4 +95,4 @@ jobs: Source: ${{ github.head_ref }} -# todo +# todosdfs -- 2.43.0 From 99f64520b35a6e3b30f8244f4d7ebc21e3965af3 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:38:30 +0200 Subject: [PATCH 14/17] dsfgd --- .gitea/workflows/build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 69ca045..40a9137 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -40,7 +40,6 @@ jobs: Status: ${{ job.status }} Source: ${{ github.head_ref }} - build: needs: [gitleaks, hadolint] # shellcheck steps: @@ -55,7 +54,7 @@ jobs: type=ref,event=branch type=ref,event=pr images: | - "registry.mgrote.net/${{ steps.meta.outputs.REPO_NAME }}" + registry.mgrote.net/httpd - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 # - name: Login to Docker Hub -- 2.43.0 From bf72f00cecaec5250672f56ca9f8ee57ba96ac42 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:53:41 +0200 Subject: [PATCH 15/17] fgdsfgd (#44) Reviewed-on: https://git.mgrote.net///container-images/httpd/pulls/44 Co-authored-by: Michael Grote Co-committed-by: Michael Grote --- .gitea/workflows/build.yaml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 40a9137..4f0bc94 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -45,31 +45,23 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + - name: Extract repository name + id: name + run: | + echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT - name: Docker meta id: meta uses: docker/metadata-action@v5 with: - # generate Docker tags based on the following events/attributes - tags: | - type=ref,event=branch - type=ref,event=pr images: | - registry.mgrote.net/httpd - - name: Set up Docker Buildx + registry.mgrote.net/${{ steps.name.outputs.REPO_NAME }} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 # - name: Login to Docker Hub # uses: docker/login-action@v3 # with: # username: ${{ secrets.DOCKERHUB_USERNAME }} # password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Extract repository name - id: meta - run: | - echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT - - name: Extract branch name - shell: bash - run: echo $GITHUB_HEAD_REF | tr -cd '[:alnum:]' | sed s/^/REPO_BRANCH=/g >> $GITHUB_OUTPUT - id: extract_branch - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v6 with: -- 2.43.0 From 9d4eefe645fcac5a756035a0fa55d1b018b1e62e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:54:32 +0200 Subject: [PATCH 16/17] sdf --- .gitea/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4f0bc94..f5da231 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -86,4 +86,7 @@ jobs: Source: ${{ github.head_ref }} + # dfgdsfg + + # todosdfs -- 2.43.0 From 0233070d313af9e14a5e2277d62d600c239b2b36 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 13 Oct 2024 19:55:36 +0200 Subject: [PATCH 17/17] sdfasd --- .gitea/workflows/build.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f5da231..a51251f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,5 +1,6 @@ name: "lint, build and push" # https://docs.docker.com/build/ci/github-actions/manage-tags-labels/ +# Variables: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#default-environment-variables + https://forgejo.org/docs/latest/user/actions/#env-1 on: schedule: - cron: "32 17 * * SUN" @@ -84,9 +85,3 @@ jobs: Job: ${{ github.action }} Status: ${{ job.status }} Source: ${{ github.head_ref }} - - - # dfgdsfg - - -# todosdfs -- 2.43.0