diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_push.yaml index 78b682505..a2dbdfdab 100644 --- 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 index 63e8de329..de291a470 100644 --- 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 \ No newline at end of file + && sudo mv ./quarto-${QUARTO_VERSION}/bin/quarto /usr/local/bin/ \ No newline at end of file diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 705c90178..eea59faeb 100644 --- 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 index b83e64b33..391cbed4a 100644 --- 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 index fe651791b..7759fa262 100644 --- 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 index 9e6a814cb..8bee6e3fc 100644 --- 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 index 1def43c3d..6041fa767 100644 --- 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 index bfb291c98..6093e3e1c 100644 --- 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