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

Commit b133268

Browse files
samruddhikhandalesamruddhikhandale
authored
Aded manpages (posix, posix-dev, dev) to common-debian.sh (#779)
1 parent 2acd82f commit b133268

File tree

34 files changed

+78
-42
lines changed

34 files changed

+78
-42
lines changed

‎container-templates/docker-compose/.devcontainer/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ ARG UPGRADE_PACKAGES="false"
88
ARG USERNAME=vscode
99
ARG USER_UID=1000
1010
ARG USER_GID=$USER_UID
11-
1211
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
1312
COPY library-scripts/*.sh /tmp/library-scripts/
1413
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
15-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
14+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1615
#
1716
# ****************************************************************************
1817
# * TODO: Add any additional OS packages you want included in the definition *

‎container-templates/dockerfile/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG USER_UID=1000
1717
ARG USER_GID=$USER_UID
1818
COPY library-scripts/*.sh /tmp/library-scripts/
1919
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
20-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
20+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true"\
2121
#
2222
# ****************************************************************************
2323
# * TODO: Add any additional OS packages you want included in the definition *

‎containers/azure-ansible/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG USERNAME=vscode
1313
ARG USER_UID=1000
1414
ARG USER_GID=$USER_UID
1515
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
16-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
16+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1717
&& apt-get install -y libssl-dev libffi-dev python3-dev python3-pip \
1818
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
1919

‎containers/azure-blockchain/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV NVM_DIR=/usr/local/share/nvm
1313
ENV NVM_SYMLINK_CURRENT=true \
1414
PATH=${NVM_DIR}/current/bin:${PATH}
1515
COPY library-scripts/*.sh /tmp/library-scripts/
16-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
16+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1717
# Install Node
1818
&& bash /tmp/library-scripts/node-debian.sh "${NVM_DIR}" "10" "${USERNAME}" \
1919
# Install Azure CLI

‎containers/azure-cli/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG USERNAME=vscode
1111
ARG USER_UID=1000
1212
ARG USER_GID=$USER_UID
1313
COPY library-scripts/*.sh /tmp/library-scripts/
14-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
14+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1515
# Install the Azure CLI
1616
&& bash /tmp/library-scripts/azcli-debian.sh \
1717
# Clean up

‎containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG USERNAME=vscode
77
ARG USER_UID=1000
88
ARG USER_GID=$USER_UID
99
COPY library-scripts/*.sh /tmp/library-scripts/
10-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
10+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1111
# Install Azure Functions and Azure CLI
1212
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
1313
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list \

‎containers/azure-terraform/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG USERNAME=vscode
1313
ARG USER_UID=1000
1414
ARG USER_GID=$USER_UID
1515
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
16-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
16+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1717
&& apt-get install -y graphviz \
1818
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
1919

‎containers/bazel/.devcontainer/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ ARG UPGRADE_PACKAGES="false"
77
ARG USERNAME=vscode
88
ARG USER_UID=1000
99
ARG USER_GID=$USER_UID
10-
1110
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
1211
COPY library-scripts/*.sh /tmp/library-scripts/
1312
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
14-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
13+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1514
&& apt-get install -y pkg-config zip g++ zlib1g-dev unzip python \
1615
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1716

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3232
# Remove buster list to avoid unexpected errors given base image is stretch
3333
&& rm /etc/apt/sources.list.d/buster.list \
3434
# Run common script and setup user
35-
&& bash /tmp/scripts/common-debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" \
35+
&& bash /tmp/scripts/common-debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" "true"\
3636
&& bash /tmp/scripts/setup-user.sh "${USERNAME}" "${PATH}" \
3737
# Upgrade git to avoid security issue
3838
&& apt-get upgrade -yq git \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3232
# Restore man command
3333
&& yes | unminimize 2>&1 \
3434
# Run common script and setup user
35-
&& bash /tmp/scripts/common-debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" \
35+
&& bash /tmp/scripts/common-debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" "true" \
3636
&& bash /tmp/scripts/setup-user.sh "${USERNAME}" "${PATH}" \
3737
# Change owner of opt contents since Oryx can dynamically install and will run as "codespace"
3838
&& chown codespace /opt/* \

‎containers/codespaces-linux/.devcontainer/library-scripts/common-debian.sh

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/common.md
88
# Maintainer: The VS Code and Codespaces Teams
99
#
10-
# Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag]
10+
# Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag] [Add non-free packages]
1111

1212
INSTALL_ZSH=${1:-"true"}
1313
USERNAME=${2:-"automatic"}
1414
USER_UID=${3:-"automatic"}
1515
USER_GID=${4:-"automatic"}
1616
UPGRADE_PACKAGES=${5:-"true"}
1717
INSTALL_OH_MYS=${6:-"true"}
18+
ADD_NON_FREE_PACKAGES=${7:-"false"}
1819

1920
set -e
2021

@@ -71,7 +72,6 @@ apt-get-update-if-needed()
7172

7273
# Run install apt-utils to avoid debconf warning then verify presence of other common developer tools and dependencies
7374
if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
74-
apt-get-update-if-needed
7575

7676
PACKAGE_LIST="apt-utils \
7777
git \
@@ -108,7 +108,27 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
108108
sudo \
109109
ncdu \
110110
man-db \
111-
strace"
111+
strace \
112+
manpages \
113+
manpages-dev "
114+
115+
# Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
116+
if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
117+
CODENAME="$(cat /etc/os-release | grep -oE '^VERSION_CODENAME=.+$' | cut -d'=' -f2)"
118+
sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${CODENAME} main/deb http:\/\/deb\.debian\.org\/debian ${CODENAME} main contrib non-free/" /etc/apt/sources.list
119+
sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${CODENAME} main/deb http:\/\/deb\.debian\.org\/debian ${CODENAME} main contrib non-free/" /etc/apt/sources.list
120+
sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${CODENAME}-updates main/deb http:\/\/deb\.debian\.org\/debian ${CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
121+
sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${CODENAME}-updates main/deb http:\/\/deb\.debian\.org\/debian ${CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
122+
sed -i "s/deb http:\/\/deb\.debian\.org\/debian-security ${CODENAME}\/updates main/deb http:\/\/deb\.debian\.org\/debian-security ${CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
123+
sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian-security ${CODENAME}\/updates main/deb http:\/\/deb\.debian\.org\/debian-security ${CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
124+
sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
125+
sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
126+
echo "Running apt-get update..."
127+
apt-get update
128+
PACKAGE_LIST="${PACKAGE_LIST} manpages-posix manpages-posix-dev"
129+
else
130+
apt-get-update-if-needed
131+
fi
112132

113133
# Install libssl1.1 if available
114134
if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then

‎containers/dart/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG USERNAME=vscode
1212
ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/*.sh /tmp/library-scripts/
15-
RUN apt-get update && /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
15+
RUN apt-get update && /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1616
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1717

1818
# Add bin location to path

‎containers/debian/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG USERNAME=vscode
1212
ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/*.sh /tmp/library-scripts/
15-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
15+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1616
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1717

1818
# [Optional] Uncomment this section to install additional OS packages.

‎containers/docker-from-docker-compose/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG USER_UID=1000
1717
ARG USER_GID=$USER_UID
1818
COPY library-scripts/*.sh /tmp/library-scripts/
1919
RUN apt-get update \
20-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
20+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
2121
# Use Docker script from script library to set things up
2222
&& /bin/bash /tmp/library-scripts/docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}" \
2323
# Clean up

‎containers/docker-from-docker/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG USER_UID=1000
1717
ARG USER_GID=$USER_UID
1818
COPY library-scripts/*.sh /tmp/library-scripts/
1919
RUN apt-get update \
20-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
20+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
2121
# Use Docker script from script library to set things up
2222
&& /bin/bash /tmp/library-scripts/docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}" "${USE_MOBY}" \
2323
# Clean up

‎containers/docker-in-docker/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG USER_UID=1000
1717
ARG USER_GID=$USER_UID
1818
COPY library-scripts/*.sh /tmp/library-scripts/
1919
RUN apt-get update \
20-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
20+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
2121
# Use Docker script from script library to set things up
2222
&& /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "${USERNAME}" "${USE_MOBY}" \
2323
# Clean up

‎containers/dotnet/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG USERNAME=vscode
1212
ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/common-debian.sh /tmp/library-scripts/
15-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
15+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1616
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1717

1818
# [Option] Install Node.js

‎containers/go/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG USERNAME=vscode
1212
ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/common-debian.sh /tmp/library-scripts/
15-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
15+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1616
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1717

1818
# Install Go tools

‎containers/java/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG USERNAME=vscode
1212
ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/common-debian.sh /tmp/library-scripts/
15-
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
15+
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1616
&& if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \
1717
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1818

‎containers/javascript-node/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2020
# Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
2121
&& apt-get purge -y imagemagick imagemagick-6-common \
2222
# Install common packages, non-root user, update yarn and install nvm
23-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
23+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
2424
# Install yarn, nvm
2525
&& rm -rf /opt/yarn-* /usr/local/bin/yarn /usr/local/bin/yarnpkg \
2626
&& bash /tmp/library-scripts/node-debian.sh "${NVM_DIR}" "none" "${USERNAME}" \

‎containers/kubernetes-helm/.devcontainer/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ ARG TARGET_SOCKET=/var/run/docker.sock
1010
ARG USERNAME=vscode
1111
ARG USER_UID=1000
1212
ARG USER_GID=$USER_UID
13-
1413
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
1514
COPY library-scripts/*.sh /tmp/library-scripts/
1615
RUN apt-get update \
17-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
16+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1817
# Use Docker script from script library to set things up
1918
&& /bin/bash /tmp/library-scripts/docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "${SOURCE_SOCKET}" "${TARGET_SOCKET}" "${USERNAME}" \
2019
# Clean up

‎containers/perl/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/*.sh /tmp/library-scripts/
1515
RUN apt-get update \
16-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
16+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1717
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1818

1919
# [Optional] Uncomment this section to install additional packages.

‎containers/php/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG USER_UID=1000
1313
ARG USER_GID=$USER_UID
1414
COPY library-scripts/common-debian.sh /tmp/library-scripts/
1515
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
16-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
16+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1717
&& apt-get -y install --no-install-recommends lynx \
1818
&& usermod -aG www-data ${USERNAME} \
1919
&& sed -i -e "s/Listen 80/Listen 80\\nListen 8080/g" /etc/apache2/ports.conf \

‎containers/powershell/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG USER_UID=1000
1111
ARG USER_GID=$USER_UID
1212
COPY library-scripts/*.sh /tmp/library-scripts/
1313
RUN apt-get update \
14-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
14+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1515
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1616

1717
# [Optional] Uncomment this section to install additional packages.

‎containers/python-3-anaconda/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG USER_UID=1000
1111
ARG USER_GID=$USER_UID
1212
COPY .devcontainer/library-scripts/*.sh /tmp/library-scripts/
1313
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
14-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
14+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1515
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1616

1717
# [Option] Install Node.js

‎containers/python-3-miniconda/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG USER_UID=1000
1111
ARG USER_GID=$USER_UID
1212
COPY .devcontainer/library-scripts/common-debian.sh /tmp/library-scripts/
1313
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
14-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
14+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1515
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
1616

1717
# [Optional] Uncomment to install a different version of Python than the default

‎containers/python-3/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1616
# Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
1717
&& apt-get purge -y imagemagick imagemagick-6-common \
1818
# Install common packages, non-root user
19-
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
19+
&& bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
2020
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
2121

2222
# Setup default python tools in a venv via pipx to avoid conflicts

‎containers/r/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG USER_UID=1000
1515
ARG USER_GID=$USER_UID
1616
COPY library-scripts/*.sh /tmp/library-scripts/
1717
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
18-
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
18+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
1919
&& usermod -a -G staff ${USERNAME} \
2020
&& apt-get -y install \
2121
python3-pip \

0 commit comments

Comments
 (0)