2
2
# Copyright (c) Microsoft Corporation. All rights reserved.
3
3
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
4
4
# -------------------------------------------------------------------------------------------------------------
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
6
6
7
7
ARG USERNAME=codespace
8
8
ARG USER_UID=1000
@@ -69,17 +69,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
69
69
&& mkdir -p /usr/local/etc/vscode-dev-containers/ \
70
70
&& mv -f /tmp/scripts/first-run-notice.txt /usr/local/etc/vscode-dev-containers/
71
71
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
-
83
72
# Install Python, PHP, Ruby utilities
84
73
RUN bash /tmp/scripts/python-debian.sh "none" "/opt/python/latest" "${PIPX_HOME}" "${USERNAME}" "true" \
85
74
# Install rvm, rbenv, any missing base gems
@@ -93,6 +82,20 @@ RUN bash /tmp/scripts/python-debian.sh "none" "/opt/python/latest" "${PIPX_HOME}
93
82
RUN bash /tmp/scripts/powershell-debian.sh \
94
83
&& apt-get clean -y
95
84
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
+
96
99
# Install SDKMAN, OpenJDK8 (JDK 11 already present), gradle (maven already present)
97
100
RUN bash /tmp/scripts/gradle-debian.sh "latest" "${SDKMAN_DIR}" "${USERNAME}" "true" \
98
101
&& su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh \
@@ -119,7 +122,4 @@ RUN if [ -z $DeveloperBuild ]; then \
119
122
curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l /vsdbg ; \
120
123
fi
121
124
122
- USER ${USERNAME}
123
-
124
- # Bump npm
125
- RUN npm install -g npm@6
125
+ USER ${USERNAME}
0 commit comments