From a33e51c88c352242898b0233bf6e7b9ab4c2fdfc Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 18 Sep 2024 10:48:02 +1000 Subject: [PATCH 1/6] chore: build docker image --- .github/workflows/docker-push.yml | 106 ++++++++++++++++++++++++++++++ docker/linux-amd64/Dockerfile | 18 +++++ docker/linux-arm64/Dockerfile | 18 +++++ 3 files changed, 142 insertions(+) create mode 100644 .github/workflows/docker-push.yml create mode 100644 docker/linux-amd64/Dockerfile create mode 100644 docker/linux-arm64/Dockerfile diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml new file mode 100644 index 00000000..71a7a70e --- /dev/null +++ b/.github/workflows/docker-push.yml @@ -0,0 +1,106 @@ +name: Build octopus-cli Docker image + +on: + push: + workflow_dispatch: + +env: + REGISTRY_IMAGE: octopusdeploy/octopus-cli + +jobs: + build-linux: + strategy: + matrix: + os: + - ubuntu-latest + platform: + - linux/amd64 + - linux/arm64 + runs-on: ${{ matrix.os }} + env: + VERSION: ${{ github.ref_name }} + steps: + + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + echo "PLATFORM_ARCH=${platform//[linux\/]/}" >> $GITHUB_ENV + + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: linux/amd64,linux/arm64 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USER }} + password: ${{ secrets.DOCKER_HUB_PAT }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v5 + with: + context: docker/${{ env.PLATFORM_PAIR }} + platforms: ${{ matrix.platform }} + provenance: false + build-args: | + OCTOPUS_CLI_VERSION=${{ env.VERSION }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + merge: + needs: [get-version-number, build-linux] + if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }} + runs-on: ubuntu-latest + env: + VERSION_NUMBER: ${{ github.ref_name }} + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + tags: | + ${{ env.VERSION_NUMBER }} + latest + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USER }} + password: ${{ secrets.DOCKER_HUB_PAT }} + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} \ No newline at end of file diff --git a/docker/linux-amd64/Dockerfile b/docker/linux-amd64/Dockerfile new file mode 100644 index 00000000..1a0ff805 --- /dev/null +++ b/docker/linux-amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM --platform=linux/amd64 alpine:latest + +ARG OCTOPUS_CLI_VERSION=2.4.0 + +RUN apk update && apk upgrade && apk add --no-cache bash curl + +RUN curl -L https://github.com/OctopusDeploy/cli/raw/main/scripts/install.sh | VERSION=v$OCTOPUS_CLI_VERSION bash + +LABEL \ + org.label-schema.schema-version="1.0" \ + org.label-schema.name="Octopus Deploy CLI" \ + org.label-schema.vendor="Octopus Deploy" \ + org.label-schema.url="https://octopus.com" \ + org.label-schema.vcs-url="https://github.com/OctopusDeploy/cli" \ + org.label-schema.license="Apache" \ + org.label-schema.description="Octopus Deploy CLI: octopus" + +ENTRYPOINT ["octopus"] \ No newline at end of file diff --git a/docker/linux-arm64/Dockerfile b/docker/linux-arm64/Dockerfile new file mode 100644 index 00000000..c4fda8cb --- /dev/null +++ b/docker/linux-arm64/Dockerfile @@ -0,0 +1,18 @@ +FROM --platform=linux/arm64 arm64v8/alpine:latest + +ARG OCTOPUS_CLI_VERSION=2.4.0 + +RUN apk update && apk upgrade && apk add --no-cache bash curl + +RUN curl -L https://github.com/OctopusDeploy/cli/raw/main/scripts/install.sh | VERSION=v$OCTOPUS_CLI_VERSION bash + +LABEL \ + org.label-schema.schema-version="1.0" \ + org.label-schema.name="Octopus Deploy CLI" \ + org.label-schema.vendor="Octopus Deploy" \ + org.label-schema.url="https://octopus.com" \ + org.label-schema.vcs-url="https://github.com/OctopusDeploy/cli" \ + org.label-schema.license="Apache" \ + org.label-schema.description="Octopus Deploy CLI: octopus" + +ENTRYPOINT ["octopus"] \ No newline at end of file From 18578777ad6a9f4edc33d2d63f7cfddada9600cc Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 18 Sep 2024 10:49:31 +1000 Subject: [PATCH 2/6] Remove needs --- .github/workflows/docker-push.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 71a7a70e..52295848 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -69,8 +69,7 @@ jobs: if-no-files-found: error retention-days: 1 merge: - needs: [get-version-number, build-linux] - if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }} + needs: [build-linux] runs-on: ubuntu-latest env: VERSION_NUMBER: ${{ github.ref_name }} From 79ac65eb43f8320ae917f2797091daaca4ceb1e5 Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 18 Sep 2024 11:16:55 +1000 Subject: [PATCH 3/6] Sign in to internal docker registry --- .github/workflows/docker-push.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 52295848..d23844d5 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -41,8 +41,9 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_HUB_USER }} - password: ${{ secrets.DOCKER_HUB_PAT }} + registry: ${{ secrests.INTERNAL_DOCKER_REGISTRY_URL }} + username: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_USER_NAME }} + password: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_ACCESS_TOKEN }} - name: Build and push by digest id: build @@ -60,7 +61,6 @@ jobs: mkdir -p /tmp/digests digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - - name: Upload digest uses: actions/upload-artifact@v4 with: @@ -93,8 +93,9 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_HUB_USER }} - password: ${{ secrets.DOCKER_HUB_PAT }} + registry: ${{ secrests.INTERNAL_DOCKER_REGISTRY_URL }} + username: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_USER_NAME }} + password: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_ACCESS_TOKEN }} - name: Create manifest list and push working-directory: /tmp/digests run: | From 0ccbc0b8308bc5b886ff7687f73af615f6569e1e Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 18 Sep 2024 11:18:00 +1000 Subject: [PATCH 4/6] Typo --- .github/workflows/docker-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index d23844d5..9155bed8 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -41,7 +41,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - registry: ${{ secrests.INTERNAL_DOCKER_REGISTRY_URL }} + registry: ${{ secrets.INTERNAL_DOCKER_REGISTRY_URL }} username: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_USER_NAME }} password: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_ACCESS_TOKEN }} @@ -93,7 +93,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - registry: ${{ secrests.INTERNAL_DOCKER_REGISTRY_URL }} + registry: ${{ secrets.INTERNAL_DOCKER_REGISTRY_URL }} username: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_USER_NAME }} password: ${{ secrets.INTERNAL_DOCKER_READ_ONLY_ACCESS_TOKEN }} - name: Create manifest list and push From 93a713956961d60cdc58cf8531eac9f04c3e6257 Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 18 Sep 2024 11:27:36 +1000 Subject: [PATCH 5/6] Why didn't the version work.... --- .github/workflows/docker-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 9155bed8..3004c4cd 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -18,7 +18,7 @@ jobs: - linux/arm64 runs-on: ${{ matrix.os }} env: - VERSION: ${{ github.ref_name }} + VERSION: ${{ github.ref_name }} steps: - name: Prepare From c622ce8e8903de5674f43889264ef2d319eb9337 Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 18 Sep 2024 11:39:01 +1000 Subject: [PATCH 6/6] Docker push on tags only --- .github/workflows/docker-push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 3004c4cd..505e037f 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -2,6 +2,8 @@ name: Build octopus-cli Docker image on: push: + tags: + - 'v*' workflow_dispatch: env: