Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit d9f4aaa

Browse files
committed
revert all the node changes and pick up latest oryx tag
1 parent d731096 commit d9f4aaa

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

containers/codespaces-linux/.devcontainer/base.Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
5-
FROM mcr.microsoft.com/oryx/build:vso-focal-20210805.1 as kitchensink
5+
FROM mcr.microsoft.com/oryx/build:vso-focal-20210902.1 as kitchensink
66

77
ARG USERNAME=codespace
88
ARG USER_UID=1000
@@ -69,17 +69,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
6969
&& mkdir -p /usr/local/etc/vscode-dev-containers/ \
7070
&& mv -f /tmp/scripts/first-run-notice.txt /usr/local/etc/vscode-dev-containers/
7171

72-
# Setup Node.js, install NVM and NVS
73-
RUN bash /tmp/scripts/node-debian.sh "${NVM_DIR}" "v14.17.6" "${USERNAME}" \
74-
&& (cd ${NVM_DIR} && git remote get-url origin && echo $(git log -n 1 --pretty=format:%H -- .)) > ${NVM_DIR}/.git-remote-and-commit \
75-
# Install nvs (alternate cross-platform Node.js version-management tool)
76-
&& sudo -u ${USERNAME} git clone -c advice.detachedHead=false --depth 1 https://github.com/jasongin/nvs ${NVS_HOME} 2>&1 \
77-
&& (cd ${NVS_HOME} && git remote get-url origin && echo $(git log -n 1 --pretty=format:%H -- .)) > ${NVS_HOME}/.git-remote-and-commit \
78-
&& sudo -u ${USERNAME} bash ${NVS_HOME}/nvs.sh install \
79-
&& rm ${NVS_HOME}/cache/* \
80-
# Clean up
81-
&& rm -rf ${NVM_DIR}/.git ${NVS_HOME}/.git
82-
8372
# Install Python, PHP, Ruby utilities
8473
RUN bash /tmp/scripts/python-debian.sh "none" "/opt/python/latest" "${PIPX_HOME}" "${USERNAME}" "true" \
8574
# Install rvm, rbenv, any missing base gems
@@ -93,6 +82,20 @@ RUN bash /tmp/scripts/python-debian.sh "none" "/opt/python/latest" "${PIPX_HOME}
9382
RUN bash /tmp/scripts/powershell-debian.sh \
9483
&& apt-get clean -y
9584

85+
# Setup Node.js, install NVM and NVS
86+
RUN bash /tmp/scripts/node-debian.sh "${NVM_DIR}" "none" "${USERNAME}" \
87+
&& (cd ${NVM_DIR} && git remote get-url origin && echo $(git log -n 1 --pretty=format:%H -- .)) > ${NVM_DIR}/.git-remote-and-commit \
88+
# Install nvs (alternate cross-platform Node.js version-management tool)
89+
&& sudo -u ${USERNAME} git clone -c advice.detachedHead=false --depth 1 https://github.com/jasongin/nvs ${NVS_HOME} 2>&1 \
90+
&& (cd ${NVS_HOME} && git remote get-url origin && echo $(git log -n 1 --pretty=format:%H -- .)) > ${NVS_HOME}/.git-remote-and-commit \
91+
&& sudo -u ${USERNAME} bash ${NVS_HOME}/nvs.sh install \
92+
&& rm ${NVS_HOME}/cache/* \
93+
# Set npm global location
94+
&& sudo -u ${USERNAME} npm config set prefix ${NPM_GLOBAL} \
95+
&& npm config -g set prefix ${NPM_GLOBAL} \
96+
# Clean up
97+
&& rm -rf ${NVM_DIR}/.git ${NVS_HOME}/.git
98+
9699
# Install SDKMAN, OpenJDK8 (JDK 11 already present), gradle (maven already present)
97100
RUN bash /tmp/scripts/gradle-debian.sh "latest" "${SDKMAN_DIR}" "${USERNAME}" "true" \
98101
&& su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh \
@@ -119,7 +122,4 @@ RUN if [ -z $DeveloperBuild ]; then \
119122
curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l /vsdbg ; \
120123
fi
121124

122-
USER ${USERNAME}
123-
124-
# Bump npm
125-
RUN npm install -g npm@6
125+
USER ${USERNAME}

0 commit comments

Comments
 (0)