From 77ba65f83a38fce6c6a48a55ffd962eff346c9ab Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Mon, 27 Nov 2023 11:48:22 -0300 Subject: [PATCH 01/43] add platform arm64 --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 15236d5..c214594 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -25,5 +25,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 tags: koslib/ga-helm-eks:latest, koslib/ga-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 35fe479a2f8e90496360d415d109a8d6c269c04b Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 28 Nov 2023 19:48:54 -0300 Subject: [PATCH 02/43] add arch platform --- action.yml | 4 ++++ dockerhub/Dockerfile | 36 +++++++++++++++++++++++++----------- dockerhub/entrypoint.sh | 4 +++- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/action.yml b/action.yml index d2d0d05..224839c 100644 --- a/action.yml +++ b/action.yml @@ -10,6 +10,9 @@ inputs: plugins: description: "Comma-separated URLs for the Helm Plugins you need installed" required: false + arch: + description: "Architecture for the Helm Plugin binaries: amd64. arm64 is also supported" + required: false outputs: result: description: "Output returned by your Helm or kubectl command" @@ -17,4 +20,5 @@ runs: using: "docker" image: "Dockerfile" args: + - ${{ inputs.arch }} - ${{ inputs.command }} diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index bfc078d..89320c8 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -1,22 +1,36 @@ -FROM mozilla/sops:v3.6.0-alpine as sops +FROM mozilla/sops:v3-alpine as sops FROM alpine:3.13 -ARG AWSCLI_VERSION="1.24.0" -ARG HELM_VERSION="3.10.1" -ARG KUBECTL_VERSION="1.25.4" +ARG HELM_VERSION="3.13.2" +ARG KUBECTL_VERSION="1.28.4" +ARG PLATFORM="arm64" COPY --from=sops /usr/local/bin/sops /usr/bin/sops -RUN apk add py-pip curl wget ca-certificates git bash jq gcc alpine-sdk -RUN pip install "awscli==${AWSCLI_VERSION}" -RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl -RUN chmod +x /usr/bin/kubectl +RUN apk update + +RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl +RUN apk add --no-cache aws-cli +RUN apk --no-cache add ca-certificates && update-ca-certificates + + -RUN curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.21.2/2021-07-05/bin/linux/amd64/aws-iam-authenticator -RUN chmod +x /usr/bin/aws-iam-authenticator +# install aws cli v2 +# RUN \ +# zipfile=awscli-exe-linux-x86_64.zip \ +# if [[ "${PLATFORM}" = "arm64" ]]; then zipfile=awscli-exe-linux-aarch64.zip fi \ +# curl -L https://awscli.amazonaws.com/$zipfile.zip -o awscliv2.zip + +# RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip" +# RUN unzip awscliv2.zip +# RUN sudo ./aws/install +RUN aws --version + +RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${PLATFORM}/kubectl +RUN chmod +x /usr/bin/kubectl -RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm +RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${PLATFORM}.tar.gz -O - | tar -xzO linux-${PLATFORM}/helm > /usr/local/bin/helm RUN chmod +x /usr/local/bin/helm COPY entrypoint.sh /entrypoint.sh diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index 20d01cd..9b0f314 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -2,6 +2,8 @@ set -e +echo "creating docker image arch: $INPUT_ARCH" + echo "${KUBE_CONFIG_DATA}" | base64 -d > kubeconfig export KUBECONFIG="${PWD}/kubeconfig" chmod 600 "${PWD}/kubeconfig" @@ -25,4 +27,4 @@ response=$(bash -c "${INPUT_COMMAND}") echo "response<> "${GITHUB_OUTPUT}" +} >> "${GITHUB_OUTPUT}" \ No newline at end of file From 7612317f41b631aa0d2df05bca0647cf1c446df2 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 28 Nov 2023 19:49:30 -0300 Subject: [PATCH 03/43] remove code comments --- dockerhub/Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 89320c8..c6c718f 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -14,19 +14,6 @@ RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates - - -# install aws cli v2 -# RUN \ -# zipfile=awscli-exe-linux-x86_64.zip \ -# if [[ "${PLATFORM}" = "arm64" ]]; then zipfile=awscli-exe-linux-aarch64.zip fi \ -# curl -L https://awscli.amazonaws.com/$zipfile.zip -o awscliv2.zip - -# RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip" -# RUN unzip awscliv2.zip -# RUN sudo ./aws/install -RUN aws --version - RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${PLATFORM}/kubectl RUN chmod +x /usr/bin/kubectl From 3a8d5a1fb5a406497bcc09cd3e3b3037a5d62b82 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 28 Nov 2023 20:50:07 -0300 Subject: [PATCH 04/43] update --- Dockerfile | 1 - action.yml | 4 ---- dockerhub/Dockerfile | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c5ede58..d73d5ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. - FROM koslib/ga-helm-eks:2.5 \ No newline at end of file diff --git a/action.yml b/action.yml index 224839c..d2d0d05 100644 --- a/action.yml +++ b/action.yml @@ -10,9 +10,6 @@ inputs: plugins: description: "Comma-separated URLs for the Helm Plugins you need installed" required: false - arch: - description: "Architecture for the Helm Plugin binaries: amd64. arm64 is also supported" - required: false outputs: result: description: "Output returned by your Helm or kubectl command" @@ -20,5 +17,4 @@ runs: using: "docker" image: "Dockerfile" args: - - ${{ inputs.arch }} - ${{ inputs.command }} diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index c6c718f..390c39e 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -4,7 +4,7 @@ FROM alpine:3.13 ARG HELM_VERSION="3.13.2" ARG KUBECTL_VERSION="1.28.4" -ARG PLATFORM="arm64" +ARG PLATFORM="amd64" COPY --from=sops /usr/local/bin/sops /usr/bin/sops From cdeaebe88400c8a6dbf54ce9fae30f25a3ed6fc3 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 28 Nov 2023 23:19:33 -0300 Subject: [PATCH 05/43] update --- Dockerfile | 3 ++- dockerhub/Dockerfile | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d73d5ac..c57d21c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. -FROM koslib/ga-helm-eks:2.5 \ No newline at end of file +#FROM koslib/ga-helm-eks:2.5 +FROM digonill/helm-base-test:1.0 \ No newline at end of file diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 390c39e..8d0b072 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -1,12 +1,17 @@ -FROM mozilla/sops:v3-alpine as sops - -FROM alpine:3.13 +FROM alpine:3.18.4 ARG HELM_VERSION="3.13.2" ARG KUBECTL_VERSION="1.28.4" -ARG PLATFORM="amd64" -COPY --from=sops /usr/local/bin/sops /usr/bin/sops +RUN echo "I am running on $BUILDPLATFORM ($BUILDARCH), building for $TARGETPLATFORM" + +# Download the binary +RUN curl -k -L -O https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${BUILDARCH} +# Move the binary in to your PATH +RUN mv sops-v3.8.1.linux.${BUILDARCH} /usr/local/bin/sops +# Make the binary executable +RUN chmod +x /usr/local/bin/sops + RUN apk update @@ -14,10 +19,10 @@ RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates -RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${PLATFORM}/kubectl +RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${BUILDARCH}/kubectl RUN chmod +x /usr/bin/kubectl -RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${PLATFORM}.tar.gz -O - | tar -xzO linux-${PLATFORM}/helm > /usr/local/bin/helm +RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${BUILDARCH}.tar.gz -O - | tar -xzO linux-${BUILDARCH}/helm > /usr/local/bin/helm RUN chmod +x /usr/local/bin/helm COPY entrypoint.sh /entrypoint.sh From 5150e61f19d8c56e3d395e38b342dc28a02156c1 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 29 Nov 2023 15:10:57 -0300 Subject: [PATCH 06/43] add param for multi-platform --- Dockerfile | 4 ++-- dockerhub/Dockerfile | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c57d21c..d80d169 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. -#FROM koslib/ga-helm-eks:2.5 -FROM digonill/helm-base-test:1.0 \ No newline at end of file + +FROM digonill/helm-base-test:1.0.1 diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 8d0b072..40463b3 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -1,12 +1,17 @@ -FROM alpine:3.18.4 +FROM --platform=${BUILDPLATFORM} alpine:3.18.4 + +# set build arguments automatically using buildx +ARG BUILDPLATFORM +ARG TARGETPLATFORM +ARG BUILDARCH ARG HELM_VERSION="3.13.2" ARG KUBECTL_VERSION="1.28.4" -RUN echo "I am running on $BUILDPLATFORM ($BUILDARCH), building for $TARGETPLATFORM" +RUN echo I am running on $BUILDPLATFORM $BUILDARCH, building for $TARGETPLATFORM # Download the binary -RUN curl -k -L -O https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${BUILDARCH} +RUN wget --no-check-certificate https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${BUILDARCH} # Move the binary in to your PATH RUN mv sops-v3.8.1.linux.${BUILDARCH} /usr/local/bin/sops # Make the binary executable From 3f73881e34ae456a4e4244db970254b402813531 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 29 Nov 2023 16:28:22 -0300 Subject: [PATCH 07/43] Fix bug dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d80d169..139e5ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. - -FROM digonill/helm-base-test:1.0.1 +FROM koslib/ga-helm-eks:2.5 From 6d6d43d8f44b3b2210de20a0713384dd65e92592 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Thu, 30 Nov 2023 10:01:20 -0300 Subject: [PATCH 08/43] add fork to deploy using arm64 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 139e5ac..a0c8ce1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. -FROM koslib/ga-helm-eks:2.5 +#FROM koslib/ga-helm-eks:2.5 +FROM digonill/helm-base-test:1.0.1 From 8f409fa7d563bda4fe9a2a63f916b72755b71aef Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Thu, 30 Nov 2023 21:55:54 -0300 Subject: [PATCH 09/43] up --- Dockerfile | 2 +- dockerhub/Dockerfile | 14 ++++++++------ dockerhub/entrypoint.sh | 22 +++++++++++++++++++--- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0c8ce1..08fa764 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. #FROM koslib/ga-helm-eks:2.5 -FROM digonill/helm-base-test:1.0.1 +FROM digonill/helm-base-test:1.0.2 \ No newline at end of file diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 40463b3..da47d1e 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -2,18 +2,20 @@ FROM --platform=${BUILDPLATFORM} alpine:3.18.4 # set build arguments automatically using buildx ARG BUILDPLATFORM -ARG TARGETPLATFORM ARG BUILDARCH +ARG TARGETPLATFORM +ARG TARGETARCH + ARG HELM_VERSION="3.13.2" ARG KUBECTL_VERSION="1.28.4" -RUN echo I am running on $BUILDPLATFORM $BUILDARCH, building for $TARGETPLATFORM +RUN echo I am running on $BUILDPLATFORM $BUILDARCH, to target arch for $TARGETPLATFORM $TARGETARCH # Download the binary -RUN wget --no-check-certificate https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${BUILDARCH} +RUN wget --no-check-certificate https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${TARGETARCH} # Move the binary in to your PATH -RUN mv sops-v3.8.1.linux.${BUILDARCH} /usr/local/bin/sops +RUN mv sops-v3.8.1.linux.${TARGETARCH} /usr/local/bin/sops # Make the binary executable RUN chmod +x /usr/local/bin/sops @@ -24,10 +26,10 @@ RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates -RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${BUILDARCH}/kubectl +RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl RUN chmod +x /usr/bin/kubectl -RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${BUILDARCH}.tar.gz -O - | tar -xzO linux-${BUILDARCH}/helm > /usr/local/bin/helm +RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm RUN chmod +x /usr/local/bin/helm COPY entrypoint.sh /entrypoint.sh diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index 9b0f314..3201758 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -2,8 +2,6 @@ set -e -echo "creating docker image arch: $INPUT_ARCH" - echo "${KUBE_CONFIG_DATA}" | base64 -d > kubeconfig export KUBECONFIG="${PWD}/kubeconfig" chmod 600 "${PWD}/kubeconfig" @@ -21,7 +19,25 @@ fi echo "running entrypoint command(s)" -response=$(bash -c "${INPUT_COMMAND}") +TEST_INPUT_COMMAND=$(cat < Date: Thu, 30 Nov 2023 22:17:03 -0300 Subject: [PATCH 10/43] update --- dockerhub/entrypoint.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index 3201758..fefabd7 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -17,28 +17,7 @@ then done fi -echo "running entrypoint command(s)" - -TEST_INPUT_COMMAND=$(cat < Date: Thu, 30 Nov 2023 22:18:15 -0300 Subject: [PATCH 11/43] update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 08fa764..18254a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. #FROM koslib/ga-helm-eks:2.5 -FROM digonill/helm-base-test:1.0.2 \ No newline at end of file +FROM digonill/helm-base-test:1.0.3 \ No newline at end of file From e0a9b0e7db8613737b559d5b87b29ced62fe365b Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Thu, 30 Nov 2023 23:00:59 -0300 Subject: [PATCH 12/43] update --- dockerhub/entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index fefabd7..1ff0cb6 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -17,7 +17,10 @@ then done fi -response=$(bash -c "$INPUT_COMMAND") +echo "running command: [${INPUT_COMMAND}]" + +response=$(bash -c "${INPUT_COMMAND}") + { echo "response< Date: Thu, 30 Nov 2023 23:41:26 -0300 Subject: [PATCH 13/43] up --- dockerhub/Dockerfile | 7 ++++--- dockerhub/entrypoint.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index da47d1e..09306e1 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -13,7 +13,7 @@ ARG KUBECTL_VERSION="1.28.4" RUN echo I am running on $BUILDPLATFORM $BUILDARCH, to target arch for $TARGETPLATFORM $TARGETARCH # Download the binary -RUN wget --no-check-certificate https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${TARGETARCH} +RUN wget https://github.com/getsops/sops/releases/download/v3.8.1/sops-v3.8.1.linux.${TARGETARCH} # Move the binary in to your PATH RUN mv sops-v3.8.1.linux.${TARGETARCH} /usr/local/bin/sops # Make the binary executable @@ -26,10 +26,11 @@ RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates -RUN curl -k -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl +RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl RUN chmod +x /usr/bin/kubectl -RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm +RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm + RUN chmod +x /usr/local/bin/helm COPY entrypoint.sh /entrypoint.sh diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index 1ff0cb6..a80e4dc 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -17,7 +17,7 @@ then done fi -echo "running command: [${INPUT_COMMAND}]" +echo "running entrypoint command(s)" response=$(bash -c "${INPUT_COMMAND}") From bd29ac99e37dae52a42480d9a3717a34cc90daa9 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Thu, 30 Nov 2023 23:58:26 -0300 Subject: [PATCH 14/43] update workflow --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index c214594..45fbf61 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -11,7 +11,7 @@ jobs: docker: runs-on: ubuntu-latest env: - DOCKERHUB_USERNAME: koslib + DOCKERHUB_USERNAME: ${{ var.DOCKER_USERNAME }} steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 6d5e5d1d0b84f9860ae1a05f2254b633c61d2f8e Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Thu, 30 Nov 2023 23:59:44 -0300 Subject: [PATCH 15/43] update --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 45fbf61..9a52a94 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -26,4 +26,4 @@ jobs: push: true context: "{{defaultContext}}:dockerhub" platforms: linux/amd64,linux/arm64 - tags: koslib/ga-helm-eks:latest, koslib/ga-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file + tags: digonill/dgnll-helm-eks:latest, dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 01a3340046d7544d5f34b51368fc7e0f8ad1a987 Mon Sep 17 00:00:00 2001 From: rodrigo-oliveira-silva <126291683+rodrigo-oliveira-silva@users.noreply.github.com> Date: Fri, 1 Dec 2023 00:07:38 -0300 Subject: [PATCH 16/43] Create main.yml --- .github/workflows/main.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..f6f6f1f --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,29 @@ +name: Dockerhub Build + +on: + workflow_dispatch: + inputs: + tag: + type: string + required: true + +jobs: + docker: + runs-on: ubuntu-latest + env: + DOCKERHUB_USERNAME: ${{ var.DOCKER_USERNAME }} + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v3 + with: + push: true + context: "{{defaultContext}}:dockerhub" + platforms: linux/amd64,linux/arm64 + tags: digonill/dgnll-helm-eks:latest, dgnll-helm-eks:${{ github.event.inputs.tag }} From f2e1f97566fa52313775946d5c8bee6abdfc2766 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Fri, 1 Dec 2023 00:12:20 -0300 Subject: [PATCH 17/43] remove main --- .github/workflows/main.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index f6f6f1f..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Dockerhub Build - -on: - workflow_dispatch: - inputs: - tag: - type: string - required: true - -jobs: - docker: - runs-on: ubuntu-latest - env: - DOCKERHUB_USERNAME: ${{ var.DOCKER_USERNAME }} - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ env.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v3 - with: - push: true - context: "{{defaultContext}}:dockerhub" - platforms: linux/amd64,linux/arm64 - tags: digonill/dgnll-helm-eks:latest, dgnll-helm-eks:${{ github.event.inputs.tag }} From a63be0ed82244c9f5b4f786b8639d0f281946379 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Fri, 1 Dec 2023 00:13:43 -0300 Subject: [PATCH 18/43] update wfn --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 9a52a94..a607f58 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -11,7 +11,7 @@ jobs: docker: runs-on: ubuntu-latest env: - DOCKERHUB_USERNAME: ${{ var.DOCKER_USERNAME }} + DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }} steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From d31a1ab2e9129a0b1fae9322ea3a8d71a345d190 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Fri, 1 Dec 2023 00:21:08 -0300 Subject: [PATCH 19/43] update wfn --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index a607f58..6e4523e 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -26,4 +26,4 @@ jobs: push: true context: "{{defaultContext}}:dockerhub" platforms: linux/amd64,linux/arm64 - tags: digonill/dgnll-helm-eks:latest, dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file + tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 0889ee0e9d885af17041c0e59bdc684491f1225f Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Fri, 1 Dec 2023 00:31:43 -0300 Subject: [PATCH 20/43] update docker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18254a2..3528ead 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. #FROM koslib/ga-helm-eks:2.5 -FROM digonill/helm-base-test:1.0.3 \ No newline at end of file +FROM digonill/dgnll-helm-eks:1.0.0 \ No newline at end of file From 1cb5fcc4780db60fd5d0fdb642a9c62edf9fbf27 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Mon, 4 Dec 2023 20:52:16 -0300 Subject: [PATCH 21/43] update --- .github/workflows/dockerhub.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 6e4523e..6f3e8d3 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -13,8 +13,15 @@ jobs: env: DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }} steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 + - name: Login to Docker Hub uses: docker/login-action@v2 with: From 44e7d4ccce94e8aea0ba19bc24abf64fcd098f78 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Mon, 4 Dec 2023 20:55:44 -0300 Subject: [PATCH 22/43] update docker version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3528ead..8217dff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. #FROM koslib/ga-helm-eks:2.5 -FROM digonill/dgnll-helm-eks:1.0.0 \ No newline at end of file +FROM digonill/dgnll-helm-eks:1.0.1 \ No newline at end of file From 53ad77b1543cd70608457cca8b7f3dea0b92eb89 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 17:25:18 -0300 Subject: [PATCH 23/43] remove plat linux/amd64, --- dockerhub/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 09306e1..2523ca2 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -34,4 +34,6 @@ RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O RUN chmod +x /usr/local/bin/helm COPY entrypoint.sh /entrypoint.sh + +RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] From 35372cf65210d0364a0c7c539e23e2fb66583519 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 17:32:46 -0300 Subject: [PATCH 24/43] remove linux amd --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 6f3e8d3..8fa4921 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -32,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/amd64,linux/arm64 + platforms: linux/arm64 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From a4488e85149ae5caf96336fe5068f9942939fd09 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 17:36:10 -0300 Subject: [PATCH 25/43] update to image latest --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8217dff..1498f2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. #FROM koslib/ga-helm-eks:2.5 -FROM digonill/dgnll-helm-eks:1.0.1 \ No newline at end of file +FROM digonill/dgnll-helm-eks:latest \ No newline at end of file From 572a756e7b88a3b673677469e998c67d60b4876e Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 17:40:53 -0300 Subject: [PATCH 26/43] update --- dockerhub/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index a80e4dc..becb653 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/ash set -e From b958ca8f1c917908bc8b049b0208e648628c0867 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 18:30:09 -0300 Subject: [PATCH 27/43] add arch linux arm64 e x64 --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 8fa4921..6f3e8d3 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -32,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/arm64 + platforms: linux/amd64,linux/arm64 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 284aaa058b9662fe92feb6d85e46d220fe2f8c16 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 20:32:42 -0300 Subject: [PATCH 28/43] update entrypoint.sh --- dockerhub/entrypoint.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index becb653..e94e009 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -17,12 +17,7 @@ then done fi -echo "running entrypoint command(s)" +echo "running entrypoint with command(s):${INPUT_COMMAND}" response=$(bash -c "${INPUT_COMMAND}") - -{ - echo "response<> "${GITHUB_OUTPUT}" \ No newline at end of file +echo "$response" >> ${GITHUB_OUTPUT} \ No newline at end of file From b53471fff7ecb0ecc40a588c29dadfa674cfd368 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 20:33:13 -0300 Subject: [PATCH 29/43] remove amd64 --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 6f3e8d3..8fa4921 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -32,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/amd64,linux/arm64 + platforms: linux/arm64 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 12e7962ba56f4c13b2db98ce0812b3434e6728c2 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Tue, 5 Dec 2023 21:05:45 -0300 Subject: [PATCH 30/43] update entrypoint --- dockerhub/entrypoint.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index e94e009..63175a3 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/sh set -e @@ -19,5 +19,10 @@ fi echo "running entrypoint with command(s):${INPUT_COMMAND}" -response=$(bash -c "${INPUT_COMMAND}") -echo "$response" >> ${GITHUB_OUTPUT} \ No newline at end of file +response=$(sh -c "$INPUT_COMMAND") + +{ + echo "response<> "$GITHUB_OUTPUT" \ No newline at end of file From 2854708384cb0e17692394fd1ed3376bb03e2f6e Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 12:03:36 -0300 Subject: [PATCH 31/43] update multi-stage --- .github/workflows/dockerhub.yaml | 2 +- dockerhub/Dockerfile | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 8fa4921..8988a82 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -32,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/arm64 + platforms: linux/arm64, linux/amd64 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 2523ca2..b47b721 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} alpine:3.18.4 +FROM --platform=${BUILDPLATFORM} alpine:3.18.4 as prepared-binary # set build arguments automatically using buildx ARG BUILDPLATFORM @@ -19,21 +19,18 @@ RUN mv sops-v3.8.1.linux.${TARGETARCH} /usr/local/bin/sops # Make the binary executable RUN chmod +x /usr/local/bin/sops - RUN apk update RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates -RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl +RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl --insecure RUN chmod +x /usr/bin/kubectl -RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm - +RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm RUN chmod +x /usr/local/bin/helm -COPY entrypoint.sh /entrypoint.sh - +COPY --from=prepared-binary entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] From d236433f32633f35e9914d45ac93c6ecef9af288 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 12:09:34 -0300 Subject: [PATCH 32/43] update --- dockerhub/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index b47b721..5788602 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} alpine:3.18.4 as prepared-binary +FROM --platform=${BUILDPLATFORM} alpine:3.18.4 AS Stage1 # set build arguments automatically using buildx ARG BUILDPLATFORM @@ -26,11 +26,13 @@ RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl --insecure -RUN chmod +x /usr/bin/kubectl - RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm + +RUN chmod +x /usr/bin/kubectl RUN chmod +x /usr/local/bin/helm -COPY --from=prepared-binary entrypoint.sh /entrypoint.sh +WORKDIR / + +COPY --from=Stage1 entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] From ec6dd804a020061a199cf1b717003ca4362aa4ad Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 12:17:23 -0300 Subject: [PATCH 33/43] update --- dockerhub/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 5788602..2df97a8 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} alpine:3.18.4 AS Stage1 +FROM --platform=${BUILDPLATFORM} alpine:3.18.4 AS Base # set build arguments automatically using buildx ARG BUILDPLATFORM @@ -31,8 +31,9 @@ RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux- RUN chmod +x /usr/bin/kubectl RUN chmod +x /usr/local/bin/helm -WORKDIR / -COPY --from=Stage1 entrypoint.sh /entrypoint.sh +FROM Base AS Exec + +COPY --from=Exec entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] From 86e5552b74a61aba47f33df33009721a691d4529 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 12:19:51 -0300 Subject: [PATCH 34/43] update --- dockerhub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index 2df97a8..f5c31f3 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -34,6 +34,6 @@ RUN chmod +x /usr/local/bin/helm FROM Base AS Exec -COPY --from=Exec entrypoint.sh /entrypoint.sh +COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] From 0c381afbe1de005c3d2b72453bf633688454a672 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 12:26:47 -0300 Subject: [PATCH 35/43] update --- dockerhub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index f5c31f3..e88700c 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -32,7 +32,7 @@ RUN chmod +x /usr/bin/kubectl RUN chmod +x /usr/local/bin/helm -FROM Base AS Exec +FROM base AS Exec COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh From 799bba22f0d79e11dc71717a67cda87b489e62aa Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 15:50:00 -0300 Subject: [PATCH 36/43] fix error arm64 --- dockerhub/Dockerfile | 4 ++-- dockerhub/entrypoint.sh | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile index e88700c..3ce1460 100644 --- a/dockerhub/Dockerfile +++ b/dockerhub/Dockerfile @@ -25,8 +25,8 @@ RUN apk add py-pip curl wget git bash jq gcc alpine-sdk openssl RUN apk add --no-cache aws-cli RUN apk --no-cache add ca-certificates && update-ca-certificates -RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl --insecure -RUN wget --no-check-certificate https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm +RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl +RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz -O - | tar -xzO linux-${TARGETARCH}/helm > /usr/local/bin/helm RUN chmod +x /usr/bin/kubectl RUN chmod +x /usr/local/bin/helm diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index 63175a3..e8f9f86 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -19,10 +19,7 @@ fi echo "running entrypoint with command(s):${INPUT_COMMAND}" -response=$(sh -c "$INPUT_COMMAND") +response=$(sh -c "${INPUT_COMMAND}") -{ - echo "response<> "$GITHUB_OUTPUT" \ No newline at end of file + +echo "response=$response" >> "$GITHUB_OUTPUT" \ No newline at end of file From d019987dacec87d00041d8567750d8b0e91276da Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 19:54:20 -0300 Subject: [PATCH 37/43] update --- .github/workflows/dockerhub.yaml | 2 +- dockerhub/entrypoint.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 8988a82..62da728 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -32,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/arm64, linux/amd64 + platforms: linux/arm64, linux/amd64, linux/arm64/v8 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index e8f9f86..d423508 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -17,9 +17,12 @@ then done fi -echo "running entrypoint with command(s):${INPUT_COMMAND}" +echo "running entrypoint with command(s):" response=$(sh -c "${INPUT_COMMAND}") - -echo "response=$response" >> "$GITHUB_OUTPUT" \ No newline at end of file +{ + echo "response<> "$GITHUB_OUTPUT" \ No newline at end of file From 9e9d388917bd938257ec50dd24eea7dddb147455 Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 19:59:46 -0300 Subject: [PATCH 38/43] update linux/arm --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 62da728..e99eacd 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -32,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/arm64, linux/amd64, linux/arm64/v8 + platforms: linux/amd64, linux/arm64/v8 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 71ce86b12e18b500385a7bf211d198335fcd633a Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 20:07:01 -0300 Subject: [PATCH 39/43] add matrix --- .github/workflows/dockerhub.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index e99eacd..02c74ae 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -9,6 +9,9 @@ on: jobs: docker: + strategy: + matrix: + arch: ["amd64", "arm64/v8"] runs-on: ubuntu-latest env: DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }} @@ -32,5 +35,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/amd64, linux/arm64/v8 + platforms: ${{ format('linux/{1}', matrix.arch) }} tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 0667a053af519932f452c70e0fb97522ce8bdffe Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 20:07:59 -0300 Subject: [PATCH 40/43] update --- .github/workflows/dockerhub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 02c74ae..0612900 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -35,5 +35,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: ${{ format('linux/{1}', matrix.arch) }} + platforms: ${{ format('linux/{0}', matrix.arch) }} tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file From 00af5daa49d79b399ef15202e3f846e82f5f9e3d Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 20:28:42 -0300 Subject: [PATCH 41/43] update --- .github/workflows/dockerhub.yaml | 5 +---- dockerhub/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 0612900..e99eacd 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -9,9 +9,6 @@ on: jobs: docker: - strategy: - matrix: - arch: ["amd64", "arm64/v8"] runs-on: ubuntu-latest env: DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }} @@ -35,5 +32,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: ${{ format('linux/{0}', matrix.arch) }} + platforms: linux/amd64, linux/arm64/v8 tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file diff --git a/dockerhub/entrypoint.sh b/dockerhub/entrypoint.sh index d423508..1ac05b0 100755 --- a/dockerhub/entrypoint.sh +++ b/dockerhub/entrypoint.sh @@ -19,7 +19,7 @@ fi echo "running entrypoint with command(s):" -response=$(sh -c "${INPUT_COMMAND}") +response=$(sh -c "$INPUT_COMMAND") { echo "response< Date: Wed, 6 Dec 2023 21:13:38 -0300 Subject: [PATCH 42/43] update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1498f2b..0d79267 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ # For contributors: in case someone would like to contribute a change in the base docker image, # please open a PR for the `dockerhub/Dockerfile` in the same project. #FROM koslib/ga-helm-eks:2.5 -FROM digonill/dgnll-helm-eks:latest \ No newline at end of file +FROM koslib/ga-helm-eks:latest \ No newline at end of file From aa87a1c8822702cb40aaaf267adb05158a1c604e Mon Sep 17 00:00:00 2001 From: "rodrigo.silva" Date: Wed, 6 Dec 2023 21:13:49 -0300 Subject: [PATCH 43/43] add --- .github/workflows/dockerhub.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index e99eacd..c214594 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -11,17 +11,10 @@ jobs: docker: runs-on: ubuntu-latest env: - DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }} + DOCKERHUB_USERNAME: koslib steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - + uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub uses: docker/login-action@v2 with: @@ -32,5 +25,5 @@ jobs: with: push: true context: "{{defaultContext}}:dockerhub" - platforms: linux/amd64, linux/arm64/v8 - tags: digonill/dgnll-helm-eks:latest, digonill/dgnll-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file + platforms: linux/amd64,linux/arm64 + tags: koslib/ga-helm-eks:latest, koslib/ga-helm-eks:${{ github.event.inputs.tag }} \ No newline at end of file