Address PR comments

Author: daniel-thom

.dockerignore

@@ -1,2 +1,3 @@
 *
 !docker-entrypoint.sh
+!artifact/

.github/workflows/release.yml

@@ -195,17 +195,28 @@ jobs:
 
   docker:
     name: Build and Push Docker Image
-    needs: create-release
+    needs: build
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Extract version from tag
-        id: version
-        run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
+      - name: Extract version and image name
+        id: meta
+        run: |
+          echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
+          echo "image=ghcr.io/${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
+
+      - name: Download Linux musl artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: torc-x86_64-unknown-linux-musl
+          path: artifact
+
+      - name: Extract binaries for Docker build
+        run: tar xzf artifact/torc-x86_64-unknown-linux-musl.tar.gz -C artifact/
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
@@ -219,7 +230,7 @@ jobs:
         with:
           context: .
           push: true
-          build-args: VERSION=${{ steps.version.outputs.version }}
+          build-args: VERSION=${{ steps.meta.outputs.version }}
           tags: |
-            ghcr.io/natlabrockies/torc:${{ steps.version.outputs.version }}
-            ghcr.io/natlabrockies/torc:latest
+            ${{ steps.meta.outputs.image }}:${{ steps.meta.outputs.version }}
+            ${{ steps.meta.outputs.image }}:latest

Dockerfile

@@ -1,21 +1,23 @@
 # Usage:
-#   # Build
-#   docker build --build-arg VERSION=0.14.0 -t ghcr.io/natlabrockies/torc:0.14.0 .
+#   # Download and extract release binaries
+#   VERSION=0.14.0
+#   mkdir -p artifact
+#   curl -fsSL "https://github.com/NatLabRockies/torc/releases/download/v${VERSION}/torc-x86_64-unknown-linux-musl.tar.gz" \
+#     | tar xz -C artifact/
 #
-#   # Push to GitHub Container Registry
-#   echo $GITHUB_TOKEN | docker login ghcr.io -u USERNAME --password-stdin
-#   docker push ghcr.io/natlabrockies/torc:0.14.0
+#   # Build
+#   docker build --build-arg VERSION=$VERSION -t ghcr.io/natlabrockies/torc:$VERSION .
 #
 #   # Run with required env vars
 #   docker run -d -p 8080:8080 \
 #     -e TORC_AUTH_FILE=/data/htpasswd \
 #     -e TORC_ADMIN_USERS=admin \
 #     -v ./htpasswd:/data/htpasswd:ro \
 #     -v torc-data:/data \
-#     ghcr.io/natlabrockies/torc:0.14.0
+#     ghcr.io/natlabrockies/torc:$VERSION
 #
 #   # Run torc CLI
-#   docker run --rm ghcr.io/natlabrockies/torc:0.14.0 torc --version
+#   docker run --rm ghcr.io/natlabrockies/torc:$VERSION torc --version
 
 FROM alpine:3.23
 
@@ -29,12 +31,13 @@ LABEL org.opencontainers.image.title="torc" \
       org.opencontainers.image.version="${VERSION}" \
       org.opencontainers.image.licenses="BSD-3-Clause"
 
-# Download release binaries and remove curl afterward to keep image small
-# This is going to use pixi as soon as images are stored on conda-forge.
-RUN apk add --no-cache ca-certificates curl sqlite tmux && \
-    curl -fsSL "https://github.com/NatLabRockies/torc/releases/download/v${VERSION}/torc-x86_64-unknown-linux-musl.tar.gz" \
-      | tar xz -C /usr/local/bin/ && \
-    apk del curl
+# Install runtime dependencies
+RUN apk add --no-cache ca-certificates sqlite tmux
+
+# Copy pre-extracted release binaries from the build context
+COPY artifact/torc artifact/torc-server artifact/torc-slurm-job-runner \
+     artifact/torc-dash artifact/torc-htpasswd artifact/torc-mcp-server \
+     /usr/local/bin/
 
 # Create data directory with OpenShift-compatible permissions.
 # OpenShift runs containers as arbitrary non-root UIDs but always in group 0 (root).