update release and dockefile based on e2e test

Author: BartoszBlizniak

.github/workflows/release.yml

@@ -15,8 +15,9 @@ jobs:
             contents: write
         env:
             CLOUDSMITH_NAMESPACE: ${{ vars.CLOUDSMITH_NAMESPACE }}
+            CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
             CLOUDSMITH_SVC_SLUG: ${{ vars.CLOUDSMITH_SVC_SLUG }}
-            DOCKERHUB_USER: ${{ vars.DOCKERHUB_USER }}
+            DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
         steps:
             - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
               with:
@@ -39,7 +40,7 @@ jobs:
             - name: Create multi-platform Zipapp with PEX
               run: |
                 pex . \
-                  --output-file "cloudsmith-${VERSION}.pyz" \
+                  --output-file "cloudsmith.pyz" \
                   --console-script cloudsmith \
                   --python-shebang "/usr/bin/env python3" \
                   --venv \
@@ -78,7 +79,7 @@ jobs:
               uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
               with:
                   name: Release v${{ env.VERSION }}
-                  files: ./cloudsmith-${{ env.VERSION }}.pyz
+                  files: ./cloudsmith.pyz
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -90,16 +91,16 @@ jobs:
 
             - name: Push Zipapp to Cloudsmith
               id: push_zipapp
-              run: cloudsmith push raw "${CLOUDSMITH_NAMESPACE}/cli-zipapp" "./cloudsmith-${VERSION}.pyz" --name cloudsmith-cli --version "${VERSION}"
+              run: cloudsmith push raw "${CLOUDSMITH_NAMESPACE}/${CLOUDSMITH_REPO}" "./cloudsmith.pyz" --name cloudsmith-cli --version "${VERSION}"
 
             - name: Build Python packages
               run: python setup.py sdist bdist_wheel
 
             - name: Push source distribution to Cloudsmith
-              run: cloudsmith push python "${CLOUDSMITH_NAMESPACE}/cli" "dist/cloudsmith-cli-${VERSION}.tar.gz"
+              run: cloudsmith push python "${CLOUDSMITH_NAMESPACE}/cli" "dist/cloudsmith_cli-${VERSION}.tar.gz"
 
             - name: Push wheel to Cloudsmith
-              run: cloudsmith push python "${CLOUDSMITH_NAMESPACE}/cli" "dist/cloudsmith_cli-${VERSION}-py3-none-any.whl"
+              run: cloudsmith push python "${CLOUDSMITH_NAMESPACE}/cli" "dist/cloudsmith_cli-${VERSION}-py2.py3-none-any.whl"
 
             - name: Set up QEMU for multi-arch
               uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
@@ -114,7 +115,9 @@ jobs:
                 docker buildx build \
                   --platform linux/amd64,linux/arm64 \
                   --build-arg "CLOUDSMITH_CLI_VERSION=${VERSION}" \
-                  -t "docker.cloudsmith.io/${CLOUDSMITH_NAMESPACE}/cli-zipapp/cloudsmith-cli:${VERSION}" \
+                  --build-arg "CLOUDSMITH_NAMESPACE=${CLOUDSMITH_NAMESPACE}" \
+                  --build-arg "CLOUDSMITH_REPO=${CLOUDSMITH_REPO}" \
+                  -t "docker.cloudsmith.io/${CLOUDSMITH_NAMESPACE}/${CLOUDSMITH_REPO}/cloudsmith-cli:${VERSION}" \
                   --push .
 
             - name: Push Dockerised CLI to DockerHub (multi-arch)
@@ -126,6 +129,8 @@ jobs:
                 docker buildx build \
                   --platform linux/amd64,linux/arm64 \
                   --build-arg "CLOUDSMITH_CLI_VERSION=${VERSION}" \
+                  --build-arg "CLOUDSMITH_NAMESPACE=${CLOUDSMITH_NAMESPACE}" \
+                  --build-arg "CLOUDSMITH_REPO=${CLOUDSMITH_REPO}" \
                   -t "cloudsmith/cloudsmith-cli:${VERSION}" \
                   --push .
 

Dockerfile

@@ -9,9 +9,11 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 RUN apk add --no-cache curl bash ca-certificates
 ARG CLOUDSMITH_CLI_VERSION
+ARG CLOUDSMITH_NAMESPACE
+ARG CLOUDSMITH_REPO
 
 RUN mkdir -p /opt/cloudsmith \
- && 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" \
+ && curl -1sLf -o /opt/cloudsmith/cloudsmith "https://dl.cloudsmith.io/public/${CLOUDSMITH_NAMESPACE}/${CLOUDSMITH_REPO}/raw/names/cloudsmith-cli/versions/${CLOUDSMITH_CLI_VERSION}/cloudsmith.pyz" \
  && chmod +x /opt/cloudsmith/cloudsmith
 
 # Default command