diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cde35c6..89fd5e9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,14 +6,14 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PALETTE_VERSION: 4.5.0 - PALETTE_CLI_VERSION: 4.5.0 - PALETTE_EDGE_VERSION: 4.5.3 + PALETTE_CLI_VERSION: 4.6.6 + PALETTE_EDGE_VERSION: 4.6.21 PACKER_VERSION: 1.11.0 ORAS_VERSION: 1.0.0 TERRAFORM_VERSION: 1.9.0 - PALETTE_REGISTRY_CLI_VERSION: 4.5.0 + PALETTE_REGISTRY_CLI_VERSION: 4.6.1 K9S_VERSION: 0.32.5 + SPECTRO_CLI_VERSION: 4.6.0 jobs: docker: @@ -62,7 +62,6 @@ jobs: with: context: . build-args: | - PALETTE_VERSION=${{env.PALETTE_VERSION}} PALETTE_CLI_VERSION=${{env.PALETTE_CLI_VERSION}} PALETTE_EDGE_VERSION=${{env.PALETTE_EDGE_VERSION}} PACKER_VERSION=${{env.PACKER_VERSION}} @@ -70,6 +69,7 @@ jobs: TERRAFORM_VERSION=${{env.TERRAFORM_VERSION}} PALETTE_REGISTRY_CLI_VERSION=${{env.PALETTE_REGISTRY_CLI_VERSION}} K9S_VERSION=${{env.K9S_VERSION}} + SPECTRO_CLI_VERSION=${{env.SPECTRO_CLI_VERSION}} platforms: linux/amd64,linux/arm64 push: true tags: ghcr.io/${{ github.repository }}:${{steps.dependencies.outputs.VERSION}} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 383ab6c..73f8009 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,14 +6,14 @@ on: env: GITHUB_TOKEN: ${{ github.token }} - PALETTE_VERSION: 4.5.0 - PALETTE_CLI_VERSION: 4.5.0 - PALETTE_EDGE_VERSION: 4.5.3 + PALETTE_CLI_VERSION: 4.6.6 + PALETTE_EDGE_VERSION: 4.6.21 PACKER_VERSION: 1.11.0 ORAS_VERSION: 1.0.0 TERRAFORM_VERSION: 1.9.0 PALETTE_REGISTRY_CLI_VERSION: 4.5.0 K9S_VERSION: 0.32.5 + SPECTRO_CLI_VERSION: 4.6.0 concurrency: group: docker-${{ github.ref }} @@ -71,7 +71,6 @@ jobs: push: true tags: ghcr.io/${{ github.repository }}:dev build-args: | - PALETTE_VERSION=${{env.PALETTE_VERSION}} PALETTE_CLI_VERSION=${{env.PALETTE_CLI_VERSION}} PALETTE_EDGE_VERSION=${{env.PALETTE_EDGE_VERSION}} PACKER_VERSION=${{env.PACKER_VERSION}} @@ -79,3 +78,4 @@ jobs: TERRAFORM_VERSION=${{env.TERRAFORM_VERSION}} PALETTE_REGISTRY_CLI_VERSION=${{env.PALETTE_REGISTRY_CLI_VERSION}} K9S_VERSION=${{env.K9S_VERSION}} + SPECTRO_CLI_VERSION=${{env.SPECTRO_CLI_VERSION}} diff --git a/Dockerfile b/Dockerfile index 2f8ec87..c7056dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # Copyright (c) Spectro Cloud # SPDX-License-Identifier: Apache-2.0 -ARG PALETTE_VERSION +ARG PALETTE_REGISTRY_CLI_VERSION -FROM us-docker.pkg.dev/palette-images/palette/spectro-registry:${PALETTE_VERSION} AS server +FROM us-docker.pkg.dev/palette-images/palette/spectro-registry:${PALETTE_REGISTRY_CLI_VERSION} AS server FROM alpine:latest @@ -20,11 +20,11 @@ ADD static/defaults/registry-config.yml etc/spectro/config.yml ARG PALETTE_CLI_VERSION ARG PALETTE_EDGE_VERSION -ARG PALETTE_REGISTRY_CLI_VERSION ARG PACKER_VERSION ARG ORAS_VERSION ARG TERRAFORM_VERSION ARG K9S_VERSION +ARG SPECTRO_CLI_VERSION ENV REGISTRY_LOG_LEVEL=info ENV REGISTRY_AUTH=htpasswd @@ -39,7 +39,7 @@ RUN adduser -u 1002 -D appuser appuser && \ apk add --no-cache bash curl git openssl jq bind-tools wget ca-certificates nano aws-cli xorriso govc podman -RUN wget https://spectro-cli.s3.amazonaws.com/v$PALETTE_REGISTRY_CLI_VERSION/linux/spectro && \ +RUN wget https://spectro-cli.s3.amazonaws.com/v$SPECTRO_CLI_VERSION/linux/spectro && \ mv spectro /usr/local/bin/spectro && \ chmod +x /usr/local/bin/spectro && \ wget https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz && \