fix(rmd): move bin in quarto install only

StatCan · Oct 2, 2024 · cddc86c · cddc86c
1 parent 1c5af93
commit cddc86c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_push.yaml
@@ -27,8 +27,6 @@ on:
     # Execute at 2am EST every day
     - cron:  '0 21 * * *'
   push:
-    branches:
-      - 'master'
   pull_request:
     types:
       - 'opened'
@@ -73,6 +71,7 @@ jobs:
           - sas
           - jupyterlab-cpu
           - jupyterlab-pytorch
+          - remote-desktop
           # - jupyterlab-tensorflow removed from build. https://jirab.statcan.ca/browse/BTIS-421
     needs: pre-build-checks
     runs-on: ubuntu-latest

diff --git a/docker-bits/4_CLI.Dockerfile b/docker-bits/4_CLI.Dockerfile
@@ -87,4 +87,4 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -144,7 +144,7 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
 
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile

diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -166,7 +166,7 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
 
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile

diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -273,7 +273,7 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
 
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile

diff --git a/output/remote-desktop/Dockerfile b/output/remote-desktop/Dockerfile
@@ -219,7 +219,7 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
 
 ###############################
 ###  docker-bits/6_remote-desktop.Dockerfile

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -144,7 +144,7 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
 
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile

diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -145,7 +145,7 @@ RUN \
     && echo "${QUARTO_SHA}  quarto-${QUARTO_VERSION}-linux-amd64.tar.gz"  | sha256sum -c - \
     && tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz \
     && chmod +x quarto-${QUARTO_VERSION} \
-    && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto
+    && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/
 
 ###############################
 ###  docker-bits/5_DB-Drivers.Dockerfile