From 3df7ebb7c073749d9f2dd688fb9720a9684b9ce3 Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 22:27:15 +0100 Subject: [PATCH 01/11] change OUTPUT_FILE -> INPUT_OUTPUT_FILE Signed-off-by: kamiKAC --- src/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh index b90445b..c43d7fc 100755 --- a/src/docker-entrypoint.sh +++ b/src/docker-entrypoint.sh @@ -147,7 +147,7 @@ update_doc() { fi if [ "${INPUT_OUTPUT_METHOD}" == "inject" ] || [ "${INPUT_OUTPUT_METHOD}" == "replace" ]; then - git_add "${working_dir}/${OUTPUT_FILE}" + git_add "${working_dir}/${INPUT_OUTPUT_FILE}" fi } From 07778294232d7defbf088d706f974bfad1e67d94 Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 22:36:47 +0100 Subject: [PATCH 02/11] change config for publish.yml Signed-off-by: kamiKAC --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 24c9436..0e6352b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ on: - main env: - REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} + REGISTRY_USERNAME: ${{ secrets.DOCKERHUBUSERNAME }} jobs: docker: @@ -20,14 +20,14 @@ jobs: if: env.REGISTRY_USERNAME != '' with: registry: quay.io - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} + username: ${{ secrets.DOCKERHUBUSERNAME }} + password: ${{ secrets.DOCKERHUBACCESSTOKEN }} - name: Build Docker image if: env.REGISTRY_USERNAME != '' run: | docker build --pull --tag quay.io/terraform-docs/gh-actions:edge . - docker push quay.io/terraform-docs/gh-actions:edge + docker push ${{ secrets.DOCKERHUBUSERNAME }}/gh-actions:edge release-draft: runs-on: ubuntu-latest From 6cc1a25052f887731532591ce0f221eb75150bed Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 22:54:45 +0100 Subject: [PATCH 03/11] add quotation marks Signed-off-by: kamiKAC --- src/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh index c43d7fc..1a34569 100755 --- a/src/docker-entrypoint.sh +++ b/src/docker-entrypoint.sh @@ -177,7 +177,7 @@ fi set +e num_changed=$(git_status) set -e -echo "num_changed=${num_changed}" >> $GITHUB_OUTPUT +echo "num_changed=${num_changed}" >> "$GITHUB_OUTPUT" if [ "${INPUT_GIT_PUSH}" = "true" ]; then git_commit From e6722c7e4f006646cde9e3d4b5169040ca07d11a Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 22:57:55 +0100 Subject: [PATCH 04/11] change registry Signed-off-by: kamiKAC --- .github/workflows/publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0e6352b..2937041 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,7 +19,6 @@ jobs: uses: docker/login-action@v3 if: env.REGISTRY_USERNAME != '' with: - registry: quay.io username: ${{ secrets.DOCKERHUBUSERNAME }} password: ${{ secrets.DOCKERHUBACCESSTOKEN }} From 3a78048078e9a386b500a34b019d4718a256b60c Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 23:13:57 +0100 Subject: [PATCH 05/11] trigger wf Signed-off-by: kamiKAC --- src/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh index 1a34569..d672185 100755 --- a/src/docker-entrypoint.sh +++ b/src/docker-entrypoint.sh @@ -189,4 +189,4 @@ else fi fi -exit 0 +exit 0 \ No newline at end of file From 4ff84e27e3548fd55d8347d3c06475032a653d65 Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 23:33:30 +0100 Subject: [PATCH 06/11] fix Dockerfile Signed-off-by: kamiKAC --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee42485..38c3387 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,9 @@ FROM quay.io/terraform-docs/terraform-docs:0.16.0 # this is explicitly needed because yq v4.x only exists in this repo. -RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories - -RUN set -x \ - && apk update \ - && apk add --no-cache \ +RUN apk add -X https://dl-4.alpinelinux.org/alpine/edge/community -u alpine-keys && \ + apk update && \ + apk add --no-cache \ bash \ git \ git-lfs \ From a85788066662c3934f2bbb0f77cf3096495bf7fa Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 23:36:26 +0100 Subject: [PATCH 07/11] fix image tags Signed-off-by: kamiKAC --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2937041..67ad931 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,8 +25,8 @@ jobs: - name: Build Docker image if: env.REGISTRY_USERNAME != '' run: | - docker build --pull --tag quay.io/terraform-docs/gh-actions:edge . - docker push ${{ secrets.DOCKERHUBUSERNAME }}/gh-actions:edge + docker build --pull --tag ${{ secrets.DOCKERHUBUSERNAME }}/gh-actions-tf-docs:edge . + docker push ${{ secrets.DOCKERHUBUSERNAME }}/gh-actions-tf-docs:edge release-draft: runs-on: ubuntu-latest From e6638198d75b509199b64d4ca4db3a164112143c Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 23:45:40 +0100 Subject: [PATCH 08/11] change action to self-build image Signed-off-by: kamiKAC --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 61151c4..ca66e2d 100644 --- a/action.yml +++ b/action.yml @@ -85,7 +85,7 @@ outputs: runs: using: docker - image: "docker://quay.io/terraform-docs/gh-actions:1.0.0" + image: "kamikac/gh-actions-tf-docs:edge" env: INPUT_WORKING_DIR: ${{ inputs.working-dir }} INPUT_ATLANTIS_FILE: ${{ inputs.atlantis-file }} From 22b7c2c718c947bf628474004bfe6bc4d6db3b80 Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Wed, 24 Jan 2024 23:51:25 +0100 Subject: [PATCH 09/11] fix docker image link Signed-off-by: kamiKAC --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index ca66e2d..9c5e992 100644 --- a/action.yml +++ b/action.yml @@ -85,7 +85,7 @@ outputs: runs: using: docker - image: "kamikac/gh-actions-tf-docs:edge" + image: "docker://kamikac/gh-actions-tf-docs:edge" env: INPUT_WORKING_DIR: ${{ inputs.working-dir }} INPUT_ATLANTIS_FILE: ${{ inputs.atlantis-file }} From 15b0398e1058c43f8421d88799c07c4e16c76c59 Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Thu, 25 Jan 2024 00:36:32 +0100 Subject: [PATCH 10/11] revert files to original state Signed-off-by: kamiKAC --- .github/workflows/publish.yml | 11 ++++++----- action.yml | 2 +- src/docker-entrypoint.sh | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 67ad931..24c9436 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ on: - main env: - REGISTRY_USERNAME: ${{ secrets.DOCKERHUBUSERNAME }} + REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} jobs: docker: @@ -19,14 +19,15 @@ jobs: uses: docker/login-action@v3 if: env.REGISTRY_USERNAME != '' with: - username: ${{ secrets.DOCKERHUBUSERNAME }} - password: ${{ secrets.DOCKERHUBACCESSTOKEN }} + registry: quay.io + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} - name: Build Docker image if: env.REGISTRY_USERNAME != '' run: | - docker build --pull --tag ${{ secrets.DOCKERHUBUSERNAME }}/gh-actions-tf-docs:edge . - docker push ${{ secrets.DOCKERHUBUSERNAME }}/gh-actions-tf-docs:edge + docker build --pull --tag quay.io/terraform-docs/gh-actions:edge . + docker push quay.io/terraform-docs/gh-actions:edge release-draft: runs-on: ubuntu-latest diff --git a/action.yml b/action.yml index 9c5e992..61151c4 100644 --- a/action.yml +++ b/action.yml @@ -85,7 +85,7 @@ outputs: runs: using: docker - image: "docker://kamikac/gh-actions-tf-docs:edge" + image: "docker://quay.io/terraform-docs/gh-actions:1.0.0" env: INPUT_WORKING_DIR: ${{ inputs.working-dir }} INPUT_ATLANTIS_FILE: ${{ inputs.atlantis-file }} diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh index d672185..b90445b 100755 --- a/src/docker-entrypoint.sh +++ b/src/docker-entrypoint.sh @@ -147,7 +147,7 @@ update_doc() { fi if [ "${INPUT_OUTPUT_METHOD}" == "inject" ] || [ "${INPUT_OUTPUT_METHOD}" == "replace" ]; then - git_add "${working_dir}/${INPUT_OUTPUT_FILE}" + git_add "${working_dir}/${OUTPUT_FILE}" fi } @@ -177,7 +177,7 @@ fi set +e num_changed=$(git_status) set -e -echo "num_changed=${num_changed}" >> "$GITHUB_OUTPUT" +echo "num_changed=${num_changed}" >> $GITHUB_OUTPUT if [ "${INPUT_GIT_PUSH}" = "true" ]; then git_commit @@ -189,4 +189,4 @@ else fi fi -exit 0 \ No newline at end of file +exit 0 From b144d970cfe6619351d9c0ce3748d5f63f3fe5b2 Mon Sep 17 00:00:00 2001 From: kamiKAC Date: Thu, 25 Jan 2024 00:51:41 +0100 Subject: [PATCH 11/11] add missing 'set -x' Signed-off-by: kamiKAC --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 38c3387..67d999d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,10 @@ FROM quay.io/terraform-docs/terraform-docs:0.16.0 # this is explicitly needed because yq v4.x only exists in this repo. -RUN apk add -X https://dl-4.alpinelinux.org/alpine/edge/community -u alpine-keys && \ - apk update && \ - apk add --no-cache \ +RUN set -x \ + && apk add -X https://dl-4.alpinelinux.org/alpine/edge/community -u alpine-keys \ + && apk update \ + && apk add --no-cache \ bash \ git \ git-lfs \