Skip to content
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

Jump to bottom

main-2.0: add new URL for SAS 9.4 M8 #634

Closed
wants to merge 29 commits into from
Closed

main-2.0: add new URL for SAS 9.4 M8 #634

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4cc1631
add new version of sas from azure storage
May 29, 2024
905072c
update(sasbit): add account key and secret env var name
bryanpaget Jun 4, 2024
43697b3
update(sasbit): add new env var names for sasblob
bryanpaget Jun 4, 2024
2899133
Update 6_sas.Dockerfile: add SRC_ACCOUNT_KEY
bryanpaget Jun 4, 2024
7e3d66c
make generate-dockerfiles
bryanpaget Jun 4, 2024
0489b84
update env var name to SRC_ACCOUNT_KEY
bryanpaget Jun 5, 2024
815acb5
update env var name to SRC_ACCOUNT_KEY
bryanpaget Jun 5, 2024
0503109
update env var syntax
bryanpaget Jun 5, 2024
b182926
update build_push: include secrets
bryanpaget Jun 5, 2024
6b44b11
update build_push: include secrets
bryanpaget Jun 5, 2024
943ea04
Update build_push.yaml: add secrets to make command
bryanpaget Jun 7, 2024
ba74fa2
Update build_push.yaml: add secrets to make command
bryanpaget Jun 7, 2024
bcbaf2d
update makefile
bryanpaget Jun 7, 2024
f9fadf5
update makefile
bryanpaget Jun 7, 2024
95fc091
update build_push: include secrets
bryanpaget Jun 10, 2024
c4d3032
update build_push: include secrets
bryanpaget Jun 10, 2024
ebb0877
update Github Action to use secrets
bryanpaget Jun 10, 2024
2195c59
add --no-cache-dir --quiet to pip install
bryanpaget Jun 10, 2024
f731685
use mamba instead of pip, remove libsqlite3-dev
Jun 13, 2024
804aa0d
update jupyter_server_proxy to 4.2.0
bryanpaget Jun 14, 2024
b645f9c
Merge remote-tracking branch 'origin/master-2.0' into bryan-2.0-sas-m8
bryanpaget Jun 24, 2024
12cd66f
Update Makefile
bryanpaget Jun 24, 2024
7d94d02
Update 6_sas.Dockerfile
bryanpaget Jun 26, 2024
fac4fd6
Update 6_sas.Dockerfile
bryanpaget Jun 26, 2024
77bd990
Update 6_jupyterlab.Dockerfile
bryanpaget Jun 26, 2024
40fd11c
make generate-dockerfiles
bryanpaget Jun 26, 2024
ee2832b
update chown command: sas -> jovyan
bryanpaget Jun 26, 2024
c13d41a
Update 6_sas.Dockerfile: add WORKDIR /home/jovyan
bryanpaget Jun 26, 2024
5305ade
update sas: add WORKDIR /home/jovyan
bryanpaget Jun 26, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/build_push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ jobs:
# make build emits full_image_name, image_tag, and image_repo outputs
- name: Build image
id: build-image
run: make build/${{ matrix.notebook }} REPO=${{ env.LOCAL_REPO }}
run: make build/${{ matrix.notebook }} REPO=${{ env.LOCAL_REPO }} 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
1 change: 0 additions & 1 deletion docker-bits/0_cpu_sas.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

ARG BASE_VERSION=2024-06-17

FROM k8scc01covidacr.azurecr.io/sas4c:0.0.3 as SASHome
FROM quay.io/jupyter/datascience-notebook:$BASE_VERSION

USER root
Expand Down
28 changes: 19 additions & 9 deletions docker-bits/6_sas.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,30 @@ RUN groupadd -g 1002 sasstaff && \
usermod -a -G sasstaff jovyan && \
echo "jovyan:jovyan" | chpasswd

COPY --from=SASHome /usr/local/SASHome /usr/local/SASHome
# BlobPorter

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 sas:sasstaff /usr/local/SASHome && \
ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas

COPY --from=minio/mc:RELEASE.2022-03-17T20-25-06Z /bin/mc /usr/local/bin/mc

RUN apt-get update && apt-get install -y --no-install-recommends \
libmagic1 \
&& rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && \
chmod -R 0775 /usr/local/SASHome/studioconfig

WORKDIR /home/jovyan
mathis-marcotte marked this conversation as resolved.
Show resolved Hide resolved

ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin

ENV PATH=$PATH:/usr/local/SASHome/SASPrivateJavaRuntimeEnvironment/9.4/jre/bin
Expand All @@ -40,9 +51,7 @@ EXPOSE 8561 8591 38080

# SASPY

ENV SASPY_VERSION="5.4.0"

RUN pip install sas_kernel
RUN mamba install sas_kernel saspy

# TODO: make Python version ENV var.
COPY sascfg.py /opt/conda/lib/python3.11/site-packages/saspy/sascfg.py
Expand All @@ -67,4 +76,5 @@ COPY G-CONFID107003ELNX6494M7/ /usr/local/SASHome/gensys/G-CONFID107003ELNX6494M
COPY sasv9_local.cfg /usr/local/SASHome/SASFoundation/9.4/

# Enable X command on SAS Studio

COPY spawner_usermods.sh /usr/local/SASHome/studioconfig/spawner/
29 changes: 19 additions & 10 deletions output/sas/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

ARG BASE_VERSION=2024-06-17

FROM k8scc01covidacr.azurecr.io/sas4c:0.0.3 as SASHome
FROM quay.io/jupyter/datascience-notebook:$BASE_VERSION

USER root
Expand Down Expand Up @@ -393,19 +392,30 @@ RUN groupadd -g 1002 sasstaff && \
usermod -a -G sasstaff jovyan && \
echo "jovyan:jovyan" | chpasswd

COPY --from=SASHome /usr/local/SASHome /usr/local/SASHome
# BlobPorter

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 sas:sasstaff /usr/local/SASHome && \
ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas

COPY --from=minio/mc:RELEASE.2022-03-17T20-25-06Z /bin/mc /usr/local/bin/mc

RUN apt-get update && apt-get install -y --no-install-recommends \
libmagic1 \
&& rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/local/SASHome/SASFoundation/9.4/bin/sas_en /usr/local/bin/sas && \
chmod -R 0775 /usr/local/SASHome/studioconfig

WORKDIR /home/jovyan

ENV PATH=$PATH:/usr/local/SASHome/SASFoundation/9.4/bin

ENV PATH=$PATH:/usr/local/SASHome/SASPrivateJavaRuntimeEnvironment/9.4/jre/bin
Expand All @@ -418,9 +428,7 @@ EXPOSE 8561 8591 38080

# SASPY

ENV SASPY_VERSION="5.4.0"

RUN pip install sas_kernel
RUN mamba install sas_kernel saspy

# TODO: make Python version ENV var.
COPY sascfg.py /opt/conda/lib/python3.11/site-packages/saspy/sascfg.py
Expand All @@ -445,6 +453,7 @@ COPY G-CONFID107003ELNX6494M7/ /usr/local/SASHome/gensys/G-CONFID107003ELNX6494M
COPY sasv9_local.cfg /usr/local/SASHome/SASFoundation/9.4/

# Enable X command on SAS Studio

COPY spawner_usermods.sh /usr/local/SASHome/studioconfig/spawner/

###############################
Expand Down