Skip to content

Do not merge (test updating sas) #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jose-Matsuda wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not merge (test updating sas) #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125e4b9
test updating sas in this repo
Jose-Matsuda Aug 12, 2025
704f0a2
workflows
Jose-Matsuda Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/docker-build-upload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/docker-steps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
19 changes: 18 additions & 1 deletion images/sas/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading