diff --git a/docker-bits/4_CLI.Dockerfile b/docker-bits/4_CLI.Dockerfile index 17afe968e..e404d658a 100644 --- a/docker-bits/4_CLI.Dockerfile +++ b/docker-bits/4_CLI.Dockerfile @@ -82,12 +82,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -100,9 +94,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto diff --git a/docker-bits/6_remote-desktop.Dockerfile b/docker-bits/6_remote-desktop.Dockerfile index b582fd4ee..fab29e05a 100644 --- a/docker-bits/6_remote-desktop.Dockerfile +++ b/docker-bits/6_remote-desktop.Dockerfile @@ -261,21 +261,9 @@ RUN if [ -f /usr/bin/npx ]; then \ sudo mv -f /usr/bin/npx /usr/bin/npx.old; \ fi -# RUN sudo [ /usr/bin/node -f ] && mv /usr/bin/node /usr/bin/node.old -# RUN sudo [ /usr/bin/npm -f ] && mv /usr/bin/npm /usr/bin/npm.old -# RUN sudo [ /usr/bin/npx -f ] && mv /usr/bin/npx /usr/bin/npx.old - RUN sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/node /usr/bin/node \ - && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npm /usr/bin/npm \ - && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npx /usr/bin/npx - -# RUN sudo file /usr/bin/node \ -# && sudo file /usr/bin/npm \ -# && sudo file /usr/bin/npx - -# RUN node --version \ -# && npm --version \ -# && npx --version + && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npm /usr/bin/npm \ + && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npx /usr/bin/npx RUN npm install @vscode/vsce @@ -291,10 +279,7 @@ RUN ls $VSCODE_DIR/extensions WORKDIR /tmp RUN rm -fr vscode-lang-pack-install -# We don't need to bother since we deleted the entire node_modules subdirectory. -# RUN npm uninstall -g vsce - -# Still need to restore old node, npm, npx files in /usr/bin if they existed. +# Restore old node, npm, npx files in /usr/bin if they existed. RUN if [ -f /usr/bin/node.old ]; then \ sudo mv -f /usr/bin/node.old /usr/bin/node; \ fi diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile index 278f56024..786a44191 100644 --- a/output/jupyterlab-cpu/Dockerfile +++ b/output/jupyterlab-cpu/Dockerfile @@ -139,12 +139,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -157,9 +151,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile index aa2966703..536351884 100644 --- a/output/jupyterlab-pytorch/Dockerfile +++ b/output/jupyterlab-pytorch/Dockerfile @@ -161,12 +161,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -179,9 +173,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile index 0e960aa35..c7fde8286 100644 --- a/output/jupyterlab-tensorflow/Dockerfile +++ b/output/jupyterlab-tensorflow/Dockerfile @@ -268,12 +268,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -286,9 +280,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto diff --git a/output/remote-desktop/Dockerfile b/output/remote-desktop/Dockerfile index ddef88783..5d75c8ed8 100644 --- a/output/remote-desktop/Dockerfile +++ b/output/remote-desktop/Dockerfile @@ -214,12 +214,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -232,9 +226,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto @@ -506,21 +497,9 @@ RUN if [ -f /usr/bin/npx ]; then \ sudo mv -f /usr/bin/npx /usr/bin/npx.old; \ fi -# RUN sudo [ /usr/bin/node -f ] && mv /usr/bin/node /usr/bin/node.old -# RUN sudo [ /usr/bin/npm -f ] && mv /usr/bin/npm /usr/bin/npm.old -# RUN sudo [ /usr/bin/npx -f ] && mv /usr/bin/npx /usr/bin/npx.old - RUN sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/node /usr/bin/node \ - && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npm /usr/bin/npm \ - && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npx /usr/bin/npx - -# RUN sudo file /usr/bin/node \ -# && sudo file /usr/bin/npm \ -# && sudo file /usr/bin/npx - -# RUN node --version \ -# && npm --version \ -# && npx --version + && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npm /usr/bin/npm \ + && sudo ln -sfv /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/bin/npx /usr/bin/npx RUN npm install @vscode/vsce @@ -536,10 +515,7 @@ RUN ls $VSCODE_DIR/extensions WORKDIR /tmp RUN rm -fr vscode-lang-pack-install -# We don't need to bother since we deleted the entire node_modules subdirectory. -# RUN npm uninstall -g vsce - -# Still need to restore old node, npm, npx files in /usr/bin if they existed. +# Restore old node, npm, npx files in /usr/bin if they existed. RUN if [ -f /usr/bin/node.old ]; then \ sudo mv -f /usr/bin/node.old /usr/bin/node; \ fi diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile index 4ecd945ea..964965471 100644 --- a/output/rstudio/Dockerfile +++ b/output/rstudio/Dockerfile @@ -139,12 +139,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -157,9 +151,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile index 8671a9dc0..7355c14bd 100644 --- a/output/sas/Dockerfile +++ b/output/sas/Dockerfile @@ -140,12 +140,6 @@ RUN \ && sudo mv ./argo-linux-amd64 /usr/local/bin/argo \ && argo version -# Narrowing down which quarto related step throws an error: - -# Verify what shell variables resolve to: -RUN echo ${QUARTO_VERSION} -RUN echo ${QUARTO_URL} - # Download quarto archive RUN curl -sLO ${QUARTO_URL} @@ -158,9 +152,6 @@ RUN tar -xf quarto-${QUARTO_VERSION}-linux-amd64.tar.gz # Change file modes RUN chmod +x quarto-${QUARTO_VERSION} -RUN sudo ls /usr/local/bin -RUN sudo file /usr/local/bin/quarto - # Move binaries to /usr RUN sudo rm -f /usr/local/bin/quarto RUN sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto