diff --git a/.github/workflows/docker-build-upload.yaml b/.github/workflows/docker-build-upload.yaml index d83bde3ab..c14b8bacf 100644 --- a/.github/workflows/docker-build-upload.yaml +++ b/.github/workflows/docker-build-upload.yaml @@ -41,6 +41,12 @@ on: REGISTRY_PASSWORD: description: The password for the container registry required: true + BRYAN_SA_NAME: + description: The name of the SAS storage account + required: false + BRYAN_SA_KEY: + description: The access key to the SAS storage account + required: false jobs: build-upload: @@ -96,7 +102,7 @@ jobs: # make build emits full_image_name, image_tag, and image_repo outputs - name: Build image id: build-image - run: make build/${{ inputs.image }} REPO=${{ inputs.registry-name }} DIRECTORY=${{ inputs.directory }} BUILDKIT=${{ inputs.buildkit }} + run: make build/${{ inputs.image }} REPO=${{ inputs.registry-name }} DIRECTORY=${{ inputs.directory }} BUILDKIT=${{ inputs.buildkit }} DARGS="--build-arg ACCOUNT_NAME=${{ secrets.BRYAN_SA_NAME }} --build-arg SRC_ACCOUNT_KEY=${{ secrets.BRYAN_SA_KEY }}" - name: Echo disk usage after build completion run: ./.github/scripts/echo_usage.sh diff --git a/.github/workflows/docker-steps.yaml b/.github/workflows/docker-steps.yaml index 7f93bca73..e6e5ec782 100644 --- a/.github/workflows/docker-steps.yaml +++ b/.github/workflows/docker-steps.yaml @@ -44,6 +44,12 @@ on: REGISTRY_PASSWORD: description: The password for the container registry required: true + BRYAN_SA_KEY: + description: The name of the SAS storage account + required: false + BRYAN_SA_NAME: + description: The access key to the SAS storage account + required: false outputs: is-diff: description: Is there a difference between the master branch and the current branch @@ -81,6 +87,8 @@ jobs: secrets: REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + BRYAN_SA_NAME: ${{ secrets.BRYAN_SA_NAME }} + BRYAN_SA_KEY: ${{ secrets.BRYAN_SA_KEY }} pull-upload: needs: [check-diff] diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 1ed77f094..6161a7a14 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -53,6 +53,8 @@ jobs: secrets: REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + BRYAN_SA_NAME: ${{ secrets.BRYAN_SA_NAME }} + BRYAN_SA_KEY: ${{ secrets.BRYAN_SA_KEY }} platform-jupyterlab: needs: [vars, base] diff --git a/images/sas/Dockerfile b/images/sas/Dockerfile index b20be4a0f..85fc3f463 100644 --- a/images/sas/Dockerfile +++ b/images/sas/Dockerfile @@ -7,7 +7,24 @@ RUN groupadd -g 1337 supergroup && \ echo "sas:sas" | chpasswd # Will fail if CI/CD only authenticates Dev -COPY --from=k8scc01covidacr.azurecr.io/sas4c:0.0.3 /usr/local/SASHome /usr/local/SASHome +#COPY --from=k8scc01covidacr.azurecr.io/sas4c:0.0.3 /usr/local/SASHome /usr/local/SASHome + +ARG ACCOUNT_NAME=${ACCOUNT_NAME} +ARG SRC_ACCOUNT_KEY=${SRC_ACCOUNT_KEY} + +RUN curl -L https://github.com/Azure/blobporter/releases/download/v0.6.20/bp_linux.tar.gz -o /tmp/blobporter.tar.gz && \ + tar -xf /tmp/blobporter.tar.gz -C /tmp linux_amd64/blobporter && \ + mv /tmp/linux_amd64/blobporter /usr/local/bin/blobporter && \ + rm -rf /tmp/* && \ + chmod a+x /usr/local/bin/blobporter + +RUN cd /usr/local/ && \ + blobporter -f https://bryantestsas.blob.core.windows.net/sasblobcontainer/SASHome.tar.gz -c sasblobcontainer -n SASHome.tar.gz -t blob-file && \ + tar -xzpf SASHome.tar.gz && \ + rm SASHome.tar.gz && \ + chown -R jovyan:sasstaff /usr/local/SASHome && \ + ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas + COPY --from=minio/mc:RELEASE.2025-01-17T23-25-50Z /bin/mc /usr/local/bin/mc-original