-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix(Remote Desktop): repair quarto, vscode extensions (#661)
* Cosmetic change to initiate build action on github. * Built dockerfiles. * Added build directive to include remote-desktop image. * Broke down quarto related command to verify what part throws error. * Verify if QUARTO_VERSION variable resolves incorrectly. * Checking if double quotes make a difference. * Checking to see if using ENV resolves correctly to version number instead of default * Removed trailing backslash that was causing tar to consume next line as arguments. * Verifying contents of /usr/local/bin to determine if a file named quarto is already there. * Added -f flag to mv to overwrite existing symbolic link named quarto in /usr/local/bin. * Don't know why mv -f did not work. Will instead try to preceed the mv command with rm -f. * Broke down command directive related to installation of visual studio code extensions into separate commands. * Used ENV directive to specify VS Python extension version. * Modified two more cases where version numbers were not being resolved correctly. * Investigating if directories that are supposed to exist exist. * Show directory structure of extracted vscode extension to see if there is a language pack sub-directory somewhere in there. * Narrow down which files are listed with ls as there are too many to go through manually. * Verifying if vscode-loc repo is downloaded and branch correctly set. * It may simply be that the working directory is incorrect. Checking. * Cloned vscode-loc repo does not appear to have .git directory. Verifying. * ls -d doesn't work for some reason. Will try tree instead. * Run another pwd command to clarify why final working directory before error is /tmp. * Another variation of cd command to see if changing directory into vscode-loc problem persists. * Seeing if permissions prevent me from cd-ing into language pack directory. * Checking if the branch option in git clone command messed something up. * Another attempt with some different variations in commands. No branch specification, no sudo on cd-ing. * Trying WORKDIR directive instead of using cd. * Added back the branch option in git command, checking why vsce package throws error. * Checking if an explicit dependency install takes care of a node runtime error. * Seeing if there exists a package.json file in the language pack directory and if so what's in it. * Added npm directive to list currently installed packages, then to install stream. * Maybe the pipe to grep is throwing it off. * Attempt to enable enhanced logging in workflows. * Seeing if installing npm stream package globally makes a difference. * Verifying versions of node and npm, trying to install latest version of vsce, and checking if there are any other build errors other than the ones in the vscode extensions block. * Trying to construct a local installation of node for vsce. * Unpinned based image version for remote-desktop. Will see what version of node is installed by system. Trying to install the current version of vsce to work on top. * Replaced a missing comment symbol in dockerfile. * Added a wildcard to apt-get command for gvfs binaries install. * Silly type in options flag for apt-get install command. * Trying to glob all gvfs related packages as no gvfs-bin ones were found. * Trying to resolve another missing package error with a glob for zlibc*. * Checking if original version of vsce works with updated base image. * Testing installation approach of vsce that worked on local machine. * Forgot about line continuation characters in multiline command. * Removed invalid option from bsdtar command. * Incorrect working directory when creating symbolic links. * Didn't look like the symbolic links got created under /usr/bin so trying with sudo. * Still trying to get those symbolic links to node executables created in /usr/bin. * which node returns an error, trying node --version instead. * Tracking down why symbolic links are broken. * Using absolute paths in ln commands appears to resolve the broken link formation. * Missing leading slash in absolute filepaths. * Pinning back base image to see if it creates problems with recent work. Verifying if language extension was moved into vscode extensions directory. * Recovering any node executables that were being overwritten by symbolic links that were being made to the temporary node installation. * Changing if-else statements in dockerfile to hopefully correct format. * May have forgotten semicolons in if-else syntax. * Commented out image test phase to see if we get a successful build. * Cleaned up changes in CLI and remote-desktop dockerfile bits. * Restored apt install directives for zlibc and gvfs to what they were before the base image got unpinned. * Updated workflow manifest to include the other images. Test phase is being kept commented out. * fix(4_cli): clean up run statements for optimization * fix(4_cli): change Quarto_version to ARG since it is not needed during runtime * chore: gen dockerfiles * Concatenated various RUN directives into command blocks in 4_CLI and 6_remote-desktop Dockerfiles. * Forgot to reverse one change back to ENV directive in quarto install steps. --------- Co-authored-by: jacekzbigniewdudek <[email protected]> Co-authored-by: souheil-yazji <[email protected]>
- Loading branch information
3 people
authored
Oct 9, 2024
1 parent
1c5af93
commit dd7e7e2
Showing
10 changed files
with
164 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -217,31 +217,65 @@ RUN apt-get update --yes \ | |
| # https://github.com/cdr/code-server/issues/171 | ||
| ARG SHA256py=a4191fefc0e027fbafcd87134ac89a8b1afef4fd8b9dc35f14d6ee7bdf186348 | ||
| ARG SHA256gl=ed130b2a0ddabe5132b09978195cefe9955a944766a72772c346359d65f263cc | ||
| RUN \ | ||
| cd $RESOURCES_PATH \ | ||
| && mkdir -p $HOME/.local/share \ | ||
| && mkdir -p $VSCODE_DIR/extensions \ | ||
| && VS_PYTHON_VERSION="2020.5.86806" \ | ||
| && wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix \ | ||
| && echo "${SHA256py} ms-python-release.vsix" | sha256sum -c - \ | ||
| && bsdtar -xf ms-python-release.vsix extension \ | ||
| && rm ms-python-release.vsix \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-python.python-$VS_PYTHON_VERSION \ | ||
| && VS_FRENCH_VERSION="1.68.3" \ | ||
| && VS_LOCALE_REPO_VERSION="1.68.3" \ | ||
| && git clone -b release/$VS_LOCALE_REPO_VERSION https://github.com/microsoft/vscode-loc.git \ | ||
| && cd vscode-loc \ | ||
| && npm install -g --unsafe-perm [email protected] \ | ||
| && cd i18n/vscode-language-pack-fr \ | ||
| && vsce package \ | ||
| && bsdtar -xf vscode-language-pack-fr-$VS_FRENCH_VERSION.vsix extension \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-ceintl.vscode-language-pack-fr-$VS_FRENCH_VERSION \ | ||
| && cd ../../../ \ | ||
| # -fr option is required. git clone protects the directory and cannot delete it without -fr | ||
| && rm -fr vscode-loc \ | ||
| && npm uninstall -g vsce \ | ||
| && fix-permissions $XDG_DATA_HOME \ | ||
| && clean-layer.sh | ||
|
|
||
| RUN cd $RESOURCES_PATH \ | ||
| && mkdir -p $HOME/.local/share \ | ||
| && mkdir -p $VSCODE_DIR/extensions | ||
| ENV VS_PYTHON_VERSION="2020.5.86806" | ||
| RUN wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix \ | ||
| && echo "${SHA256py} ms-python-release.vsix" | sha256sum -c - \ | ||
| && bsdtar -xf ms-python-release.vsix extension \ | ||
| && rm ms-python-release.vsix \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-python.python-$VS_PYTHON_VERSION | ||
|
|
||
| WORKDIR /tmp/vscode-lang-pack-install | ||
|
|
||
| ENV VS_FRENCH_VERSION="1.68.3" | ||
| ENV VS_LOCALE_REPO_VERSION="1.68.3" | ||
| ENV NODE_VERSION="v20.17.0" | ||
| ENV NODE_VERSION_ARCH="node-v20.17.0-linux-x64" | ||
|
|
||
| RUN git clone -vb release/$VS_LOCALE_REPO_VERSION https://github.com/microsoft/vscode-loc.git \ | ||
| && curl -O https://nodejs.org/dist/$NODE_VERSION/$NODE_VERSION_ARCH.tar.xz \ | ||
| && bsdtar -xf $NODE_VERSION_ARCH.tar.xz | ||
|
|
||
| WORKDIR $NODE_VERSION_ARCH | ||
|
|
||
| RUN if [ -f /usr/bin/node ]; then \ | ||
| sudo mv -f /usr/bin/node /usr/bin/node.old; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npm ]; then \ | ||
| sudo mv -f /usr/bin/npm /usr/bin/npm.old; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npx ]; then \ | ||
| sudo mv -f /usr/bin/npx /usr/bin/npx.old; \ | ||
| fi \ | ||
| && 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 \ | ||
| && npm install @vscode/vsce | ||
|
|
||
| WORKDIR /tmp/vscode-lang-pack-install/vscode-loc/i18n/vscode-language-pack-fr | ||
|
|
||
| RUN npx /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/node_modules/@vscode/vsce package \ | ||
| && bsdtar -xf vscode-language-pack-fr-$VS_FRENCH_VERSION.vsix extension \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-ceintl.vscode-language-pack-fr-$VS_FRENCH_VERSION \ | ||
| && ls $VSCODE_DIR/extensions | ||
|
|
||
| WORKDIR /tmp | ||
|
|
||
| RUN rm -fr vscode-lang-pack-install \ | ||
| && if [ -f /usr/bin/node.old ]; then \ | ||
| sudo mv -f /usr/bin/node.old /usr/bin/node; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npm.old ]; then \ | ||
| sudo mv -f /usr/bin/npm.old /usr/bin/npm; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npx.old ]; then \ | ||
| sudo mv -f /usr/bin/npx.old /usr/bin/npx; \ | ||
| fi \ | ||
| && fix-permissions $XDG_DATA_HOME \ | ||
| && clean-layer.sh | ||
|
|
||
| #QGIS | ||
| COPY qgis-2022.gpg.key $RESOURCES_PATH/qgis-2022.gpg.key | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -170,7 +170,7 @@ ARG ARGO_CLI_VERSION=v3.4.5 | |
| ARG ARGO_CLI_URL=https://github.com/argoproj/argo-workflows/releases/download/${ARGO_CLI_VERSION}/argo-linux-amd64.gz | ||
| ARG ARGO_CLI_SHA=0528ff0c0aa87a3f150376eee2f1b26e8b41eb96578c43d715c906304627d3a1 | ||
|
|
||
| ARG QUARTO_VERSION=1.5.52 | ||
| ENV QUARTO_VERSION=1.5.52 | ||
| ARG QUARTO_SHA=d4d47989181d49ea48907f8aee32d7fc3823955885a9bab7b07afad2dccf4451 | ||
| ARG QUARTO_URL=https://github.com/quarto-dev/quarto-cli/releases/download/v${QUARTO_VERSION}/quarto-${QUARTO_VERSION}-linux-amd64.tar.gz | ||
|
|
||
|
|
@@ -215,11 +215,12 @@ RUN \ | |
| && argo version \ | ||
| && \ | ||
| # quarto | ||
| curl -sLO ${QUARTO_URL}\ | ||
| curl -sLO ${QUARTO_URL} \ | ||
| && 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 rm -f /usr/local/bin/quarto \ | ||
| && sudo mv ./quarto-${QUARTO_VERSION} /usr/local/bin/quarto | ||
|
|
||
| ############################### | ||
| ### docker-bits/6_remote-desktop.Dockerfile | ||
|
|
@@ -444,31 +445,65 @@ RUN apt-get update --yes \ | |
| # https://github.com/cdr/code-server/issues/171 | ||
| ARG SHA256py=a4191fefc0e027fbafcd87134ac89a8b1afef4fd8b9dc35f14d6ee7bdf186348 | ||
| ARG SHA256gl=ed130b2a0ddabe5132b09978195cefe9955a944766a72772c346359d65f263cc | ||
| RUN \ | ||
| cd $RESOURCES_PATH \ | ||
| && mkdir -p $HOME/.local/share \ | ||
| && mkdir -p $VSCODE_DIR/extensions \ | ||
| && VS_PYTHON_VERSION="2020.5.86806" \ | ||
| && wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix \ | ||
| && echo "${SHA256py} ms-python-release.vsix" | sha256sum -c - \ | ||
| && bsdtar -xf ms-python-release.vsix extension \ | ||
| && rm ms-python-release.vsix \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-python.python-$VS_PYTHON_VERSION \ | ||
| && VS_FRENCH_VERSION="1.68.3" \ | ||
| && VS_LOCALE_REPO_VERSION="1.68.3" \ | ||
| && git clone -b release/$VS_LOCALE_REPO_VERSION https://github.com/microsoft/vscode-loc.git \ | ||
| && cd vscode-loc \ | ||
| && npm install -g --unsafe-perm [email protected] \ | ||
| && cd i18n/vscode-language-pack-fr \ | ||
| && vsce package \ | ||
| && bsdtar -xf vscode-language-pack-fr-$VS_FRENCH_VERSION.vsix extension \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-ceintl.vscode-language-pack-fr-$VS_FRENCH_VERSION \ | ||
| && cd ../../../ \ | ||
| # -fr option is required. git clone protects the directory and cannot delete it without -fr | ||
| && rm -fr vscode-loc \ | ||
| && npm uninstall -g vsce \ | ||
| && fix-permissions $XDG_DATA_HOME \ | ||
| && clean-layer.sh | ||
|
|
||
| RUN cd $RESOURCES_PATH \ | ||
| && mkdir -p $HOME/.local/share \ | ||
| && mkdir -p $VSCODE_DIR/extensions | ||
| ENV VS_PYTHON_VERSION="2020.5.86806" | ||
| RUN wget --quiet --no-check-certificate https://github.com/microsoft/vscode-python/releases/download/$VS_PYTHON_VERSION/ms-python-release.vsix \ | ||
| && echo "${SHA256py} ms-python-release.vsix" | sha256sum -c - \ | ||
| && bsdtar -xf ms-python-release.vsix extension \ | ||
| && rm ms-python-release.vsix \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-python.python-$VS_PYTHON_VERSION | ||
|
|
||
| WORKDIR /tmp/vscode-lang-pack-install | ||
|
|
||
| ENV VS_FRENCH_VERSION="1.68.3" | ||
| ENV VS_LOCALE_REPO_VERSION="1.68.3" | ||
| ENV NODE_VERSION="v20.17.0" | ||
| ENV NODE_VERSION_ARCH="node-v20.17.0-linux-x64" | ||
|
|
||
| RUN git clone -vb release/$VS_LOCALE_REPO_VERSION https://github.com/microsoft/vscode-loc.git \ | ||
| && curl -O https://nodejs.org/dist/$NODE_VERSION/$NODE_VERSION_ARCH.tar.xz \ | ||
| && bsdtar -xf $NODE_VERSION_ARCH.tar.xz | ||
|
|
||
| WORKDIR $NODE_VERSION_ARCH | ||
|
|
||
| RUN if [ -f /usr/bin/node ]; then \ | ||
| sudo mv -f /usr/bin/node /usr/bin/node.old; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npm ]; then \ | ||
| sudo mv -f /usr/bin/npm /usr/bin/npm.old; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npx ]; then \ | ||
| sudo mv -f /usr/bin/npx /usr/bin/npx.old; \ | ||
| fi \ | ||
| && 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 \ | ||
| && npm install @vscode/vsce | ||
|
|
||
| WORKDIR /tmp/vscode-lang-pack-install/vscode-loc/i18n/vscode-language-pack-fr | ||
|
|
||
| RUN npx /tmp/vscode-lang-pack-install/$NODE_VERSION_ARCH/node_modules/@vscode/vsce package \ | ||
| && bsdtar -xf vscode-language-pack-fr-$VS_FRENCH_VERSION.vsix extension \ | ||
| && mv extension $VSCODE_DIR/extensions/ms-ceintl.vscode-language-pack-fr-$VS_FRENCH_VERSION \ | ||
| && ls $VSCODE_DIR/extensions | ||
|
|
||
| WORKDIR /tmp | ||
|
|
||
| RUN rm -fr vscode-lang-pack-install \ | ||
| && if [ -f /usr/bin/node.old ]; then \ | ||
| sudo mv -f /usr/bin/node.old /usr/bin/node; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npm.old ]; then \ | ||
| sudo mv -f /usr/bin/npm.old /usr/bin/npm; \ | ||
| fi \ | ||
| && if [ -f /usr/bin/npx.old ]; then \ | ||
| sudo mv -f /usr/bin/npx.old /usr/bin/npx; \ | ||
| fi \ | ||
| && fix-permissions $XDG_DATA_HOME \ | ||
| && clean-layer.sh | ||
|
|
||
| #QGIS | ||
| COPY qgis-2022.gpg.key $RESOURCES_PATH/qgis-2022.gpg.key | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.