Skip to content

Commit 95adaa5

Browse files
committed
fix: Use freshly built versioned zipapp instead of pulling latest and add Docker CLI
1 parent 7366fbf commit 95adaa5

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ jobs:
5757
- name: Build Docker image
5858
id: build_cli_image
5959
run: |
60-
docker build -t cloudsmith-cli:${{ env.VERSION }} .
61-
docker save -o cloudsmith-cli:${{ env.VERSION }}.docker cloudsmith-cli:${{ env.VERSION }}
60+
docker build --build-arg CLOUDSMITH_CLI_VERSION=${{ env.VERSION }} -t docker.cloudsmith.io/${{ vars.CLOUDSMITH_NAMESPACE }}/cli-zipapp/cloudsmith-cli:${{ env.VERSION }} .
6261
- name: Push Dockerised CLI
6362
id: push_dockerised_cli
6463
run: |
65-
cloudsmith push docker ${{ vars.CLOUDSMITH_NAMESPACE }}/cli cloudsmith-cli:${{ env.VERSION }}.docker
64+
echo "${CLOUDSMITH_API_KEY}" | docker login docker.cloudsmith.io -u ${{ vars.CLOUDSMITH_SVC_SLUG }} --password-stdin
65+
docker push docker.cloudsmith.io/${{ vars.CLOUDSMITH_NAMESPACE }}/cli-zipapp/cloudsmith-cli:${{ env.VERSION }}

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
88
PATH="/opt/cloudsmith:${PATH}"
99

1010
RUN apk add --no-cache curl bash ca-certificates
11+
ARG CLOUDSMITH_CLI_VERSION
1112

1213
RUN mkdir -p /opt/cloudsmith \
13-
&& curl -1sLf -o /opt/cloudsmith/cloudsmith 'https://dl.cloudsmith.io/public/cloudsmith/cli-zipapp/raw/names/cloudsmith-cli/versions/latest/cloudsmith-latest.pyz' \
14+
&& curl -1sLf -o /opt/cloudsmith/cloudsmith "https://dl.cloudsmith.io/public/cloudsmith/cli-zipapp/raw/names/cloudsmith-cli/versions/${CLOUDSMITH_CLI_VERSION}/cloudsmith-${CLOUDSMITH_CLI_VERSION}.pyz" \
1415
&& chmod +x /opt/cloudsmith/cloudsmith
1516

1617
# Default command

0 commit comments

Comments
 (0)