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

Commit 7c4aa81

Browse files
committed
Adjust TS/JS dockerfiles to match others
1 parent 1060ecd commit 7c4aa81

File tree

5 files changed

+77
-47
lines changed

5 files changed

+77
-47
lines changed

containers/javascript-node-8/.devcontainer/Dockerfile

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,36 @@
55

66
FROM node:8
77

8-
# Configure apt
8+
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive
10-
RUN apt-get update \
11-
&& apt-get -y install --no-install-recommends apt-utils 2>&1
12-
13-
# Verify git and needed tools are installed
14-
RUN apt-get install -y git procps
10+
# Set the default shell to bash instead of sh
11+
ENV SHELL /bin/bash
1512

16-
# Remove outdated yarn from /opt and install via package
17-
# so it can be easily updated via apt-get upgrade yarn
18-
RUN rm -rf /opt/yarn-* \
13+
# Configure apt and install packages
14+
RUN apt-get update \
15+
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
#
17+
# Verify git and needed tools are installed
18+
&& apt-get install -y git procps \
19+
#
20+
# Remove outdated yarn from /opt and install via package
21+
# so it can be easily updated via apt-get upgrade yarn
22+
&& rm -rf /opt/yarn-* \
1923
&& rm -f /usr/local/bin/yarn \
2024
&& rm -f /usr/local/bin/yarnpkg \
2125
&& apt-get install -y curl apt-transport-https lsb-release \
2226
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2327
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2428
&& apt-get update \
25-
&& apt-get -y install --no-install-recommends yarn
26-
27-
# Install eslint
28-
RUN npm install -g eslint
29-
30-
# Clean up
31-
RUN apt-get autoremove -y \
29+
&& apt-get -y install --no-install-recommends yarn \
30+
#
31+
# Install eslint globally
32+
&& npm install -g eslint \
33+
#
34+
# Clean up
35+
&& apt-get autoremove -y \
3236
&& apt-get clean -y \
3337
&& rm -rf /var/lib/apt/lists/*
34-
ENV DEBIAN_FRONTEND=dialog
3538

36-
# Set the default shell to bash instead of sh
37-
ENV SHELL /bin/bash
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

containers/javascript-node-lts-mongo/.devcontainer/Dockerfile

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,36 @@
55

66
FROM node:lts
77

8-
# Configure apt
8+
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive
10-
RUN apt-get update \
11-
&& apt-get -y install --no-install-recommends apt-utils 2>&1
12-
13-
# Verify git and process tools are installed
14-
RUN apt-get install -y git procps
10+
# Set the default shell to bash instead of sh
11+
ENV SHELL /bin/bash
1512

16-
# Remove outdated yarn from /opt and install via package
17-
# so it can be easily updated via apt-get upgrade yarn
18-
RUN rm -rf /opt/yarn-* \
13+
# Configure apt and install packages
14+
RUN apt-get update \
15+
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
#
17+
# Verify git and needed tools are installed
18+
&& apt-get install -y git procps \
19+
#
20+
# Remove outdated yarn from /opt and install via package
21+
# so it can be easily updated via apt-get upgrade yarn
22+
&& rm -rf /opt/yarn-* \
1923
&& rm -f /usr/local/bin/yarn \
2024
&& rm -f /usr/local/bin/yarnpkg \
2125
&& apt-get install -y curl apt-transport-https lsb-release \
2226
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2327
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2428
&& apt-get update \
25-
&& apt-get -y install --no-install-recommends yarn
26-
27-
# Install eslint
28-
RUN npm install -g eslint
29-
30-
# Clean up
31-
RUN apt-get autoremove -y \
29+
&& apt-get -y install --no-install-recommends yarn \
30+
#
31+
# Install eslint globally
32+
&& npm install -g eslint \
33+
#
34+
# Clean up
35+
&& apt-get autoremove -y \
3236
&& apt-get clean -y \
3337
&& rm -rf /var/lib/apt/lists/*
34-
ENV DEBIAN_FRONTEND=dialog
3538

36-
# Set the default shell to bash instead of sh
37-
ENV SHELL /bin/bash
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

containers/javascript-node-lts/.devcontainer/Dockerfile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,20 @@
55

66
FROM node:lts
77

8+
# Avoid warnings by switching to noninteractive
89
ENV DEBIAN_FRONTEND=noninteractive
9-
ENV DEBIAN_FRONTEND=dialog
10+
# Set the default shell to bash instead of sh
1011
ENV SHELL /bin/bash
1112

13+
# Configure apt and install packages
1214
RUN apt-get update \
13-
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
15+
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
#
17+
# Verify git and needed tools are installed
1418
&& apt-get install -y git procps \
19+
#
20+
# Remove outdated yarn from /opt and install via package
21+
# so it can be easily updated via apt-get upgrade yarn
1522
&& rm -rf /opt/yarn-* \
1623
&& rm -f /usr/local/bin/yarn \
1724
&& rm -f /usr/local/bin/yarnpkg \
@@ -20,7 +27,14 @@ RUN apt-get update \
2027
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2128
&& apt-get update \
2229
&& apt-get -y install --no-install-recommends yarn \
30+
#
31+
# Install eslint globally
2332
&& npm install -g eslint \
33+
#
34+
# Clean up
2435
&& apt-get autoremove -y \
2536
&& apt-get clean -y \
26-
&& rm -rf /var/lib/apt/lists/* \
37+
&& rm -rf /var/lib/apt/lists/*
38+
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

containers/typescript-node-8/.devcontainer/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55

66
FROM node:8
77

8+
# Avoid warnings by switching to noninteractive
89
ENV DEBIAN_FRONTEND=noninteractive
9-
1010
# Set the default shell to bash instead of sh
1111
ENV SHELL /bin/bash
1212

13-
# Configure apt
13+
# Configure apt and install packages
1414
RUN apt-get update \
1515
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
#
1617
# Verify git and needed tools are installed
1718
&& apt-get install -y git procps \
19+
#
1820
# Remove outdated yarn from /opt and install via package
1921
# so it can be easily updated via apt-get upgrade yarn
2022
&& rm -rf /opt/yarn-* \
@@ -25,11 +27,14 @@ RUN apt-get update \
2527
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2628
&& apt-get update \
2729
&& apt-get -y install --no-install-recommends yarn \
30+
#
2831
# Install tslint and typescript globally
2932
&& npm install -g tslint typescript \
33+
#
3034
# Clean up
3135
&& apt-get autoremove -y \
3236
&& apt-get clean -y \
3337
&& rm -rf /var/lib/apt/lists/*
3438

35-
ENV DEBIAN_FRONTEND=dialog
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

containers/typescript-node-lts/.devcontainer/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55

66
FROM node:lts
77

8+
# Avoid warnings by switching to noninteractive
89
ENV DEBIAN_FRONTEND=noninteractive
9-
1010
# Set the default shell to bash instead of sh
1111
ENV SHELL /bin/bash
1212

13-
# Configure apt
13+
# Configure apt and install packages
1414
RUN apt-get update \
1515
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
#
1617
# Verify git and needed tools are installed
1718
&& apt-get install -y git procps \
19+
#
1820
# Remove outdated yarn from /opt and install via package
1921
# so it can be easily updated via apt-get upgrade yarn
2022
&& rm -rf /opt/yarn-* \
@@ -25,11 +27,14 @@ RUN apt-get update \
2527
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2628
&& apt-get update \
2729
&& apt-get -y install --no-install-recommends yarn \
30+
#
2831
# Install tslint and typescript globally
2932
&& npm install -g tslint typescript \
33+
#
3034
# Clean up
3135
&& apt-get autoremove -y \
3236
&& apt-get clean -y \
3337
&& rm -rf /var/lib/apt/lists/*
3438

35-
ENV DEBIAN_FRONTEND=dialog
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

0 commit comments

Comments
 (0)