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

Commit 1060ecd

Browse files
committed
Merge branch 'khonour/layers' of https://github.com/krystan/vscode-dev-containers into layer-consolidation
2 parents b8831f7 + ba1060e commit 1060ecd

File tree

3 files changed

+42
-57
lines changed

3 files changed

+42
-57
lines changed

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

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

66
FROM node:lts
77

8-
# Configure apt
98
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
9+
ENV DEBIAN_FRONTEND=dialog
10+
ENV SHELL /bin/bash
1511

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-* \
12+
RUN apt-get update \
13+
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
14+
&& apt-get install -y git procps \
15+
&& rm -rf /opt/yarn-* \
1916
&& rm -f /usr/local/bin/yarn \
2017
&& rm -f /usr/local/bin/yarnpkg \
2118
&& apt-get install -y curl apt-transport-https lsb-release \
2219
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2320
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2421
&& 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 \
22+
&& apt-get -y install --no-install-recommends yarn \
23+
&& npm install -g eslint \
24+
&& apt-get autoremove -y \
3225
&& apt-get clean -y \
33-
&& rm -rf /var/lib/apt/lists/*
34-
ENV DEBIAN_FRONTEND=dialog
35-
36-
# Set the default shell to bash instead of sh
37-
ENV SHELL /bin/bash
26+
&& rm -rf /var/lib/apt/lists/* \

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

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

66
FROM node:8
77

8-
# Configure apt
98
ENV DEBIAN_FRONTEND=noninteractive
10-
RUN apt-get update \
11-
&& apt-get -y install --no-install-recommends apt-utils 2>&1
129

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
14+
RUN apt-get update \
15+
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
# Verify git and needed tools are installed
17+
&& apt-get install -y git procps \
18+
# Remove outdated yarn from /opt and install via package
19+
# so it can be easily updated via apt-get upgrade yarn
20+
&& rm -rf /opt/yarn-* \
1921
&& rm -f /usr/local/bin/yarn \
2022
&& rm -f /usr/local/bin/yarnpkg \
2123
&& apt-get install -y curl apt-transport-https lsb-release \
2224
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2325
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2426
&& apt-get update \
25-
&& apt-get -y install --no-install-recommends yarn
26-
27-
# Install tslint and typescript
28-
RUN npm install -g tslint typescript
29-
30-
# Clean up
31-
RUN apt-get autoremove -y \
27+
&& apt-get -y install --no-install-recommends yarn \
28+
# Install tslint and typescript globally
29+
&& npm install -g tslint typescript \
30+
# Clean up
31+
&& apt-get autoremove -y \
3232
&& apt-get clean -y \
3333
&& rm -rf /var/lib/apt/lists/*
34-
ENV DEBIAN_FRONTEND=dialog
3534

36-
# Set the default shell to bash instead of sh
37-
ENV SHELL /bin/bash
35+
ENV DEBIAN_FRONTEND=dialog

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

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

66
FROM node:lts
77

8-
# Configure apt
98
ENV DEBIAN_FRONTEND=noninteractive
10-
RUN apt-get update \
11-
&& apt-get -y install --no-install-recommends apt-utils 2>&1
129

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
14+
RUN apt-get update \
15+
&& apt-get -y install --no-install-recommends apt-utils 2>&1 \
16+
# Verify git and needed tools are installed
17+
&& apt-get install -y git procps \
18+
# Remove outdated yarn from /opt and install via package
19+
# so it can be easily updated via apt-get upgrade yarn
20+
&& rm -rf /opt/yarn-* \
1921
&& rm -f /usr/local/bin/yarn \
2022
&& rm -f /usr/local/bin/yarnpkg \
2123
&& apt-get install -y curl apt-transport-https lsb-release \
2224
&& curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
2325
&& echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
2426
&& apt-get update \
25-
&& apt-get -y install --no-install-recommends yarn
26-
27-
# Install tslint and typescript
28-
RUN npm install -g tslint typescript
29-
30-
# Clean up
31-
RUN apt-get autoremove -y \
27+
&& apt-get -y install --no-install-recommends yarn \
28+
# Install tslint and typescript globally
29+
&& npm install -g tslint typescript \
30+
# Clean up
31+
&& apt-get autoremove -y \
3232
&& apt-get clean -y \
3333
&& rm -rf /var/lib/apt/lists/*
34-
ENV DEBIAN_FRONTEND=dialog
3534

36-
# Set the default shell to bash instead of sh
37-
ENV SHELL /bin/bash
35+
ENV DEBIAN_FRONTEND=dialog

0 commit comments

Comments
 (0)