WiP

.github/workflows/build-docker-images.yml

@@ -50,6 +50,7 @@ jobs:
           zip -j flight_sql.zip build/flight_sql
 
       - name: Upload artifacts
+        id: artifact-upload-step
         uses: actions/upload-artifact@v4
         with:
           name: flight_sql_cli_${{ matrix.os }}_${{ matrix.platform }}.zip
@@ -66,7 +67,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          secret-files: build/flight_sql
           platforms: linux/${{ matrix.platform }}
           file: Dockerfile.ci
           push: true
@@ -75,6 +75,8 @@ jobs:
             ${{ env.DOCKER_IMAGE_NAME }}:${{ github.ref_name }}-${{ matrix.platform }}
           no-cache: true
           provenance: false
+          build-args: |
+            --build-arg ARTIFACT_URL=${{ steps.artifact-upload-step.outputs.artifact-url }}
 
   update-image-manifest:
     name: Update DockerHub image manifest to include all built platforms

Dockerfile.ci

@@ -16,7 +16,8 @@ RUN apt-get update && \
     wget \
     gcc \
     git \
-    vim && \
+    vim \
+    zip && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -71,10 +72,12 @@ RUN python "scripts/create_duckdb_database_file.py" \
            --scale-factor=0.01
 
 # This build-arg gets passed by the pipeline..
-ARG GITHUB_WORKSPACE
+ARG ARTIFACT_URL
 
-# The flight_sql executable was built earlier in the Github actions pipeline - so just copy it into the image
-COPY --chown=app_user:app_user /run/secrets/flight_sql /usr/local/bin/flight_sql
+RUN curl --location --output /tmp/flight_sql.zip \
+      -H "Authorization: Bearer ${GITHUB_TOKEN}" \
+      ${ARTIFACT_URL} && \
+      unzip /tmp/flight_sql.zip -d /usr/local/bin && \
 
 COPY --chown=app_user:app_user tls tls