@@ -57,9 +57,12 @@ ARG DATA_DIR="/usr/src/data"
5757ARG TEMP_DIR="${TEMP_DIR:-/tmp}"
5858
5959ARG INSTALL_PACKAGES="git curl tini dos2unix locales"
60+ ARG INSTALL_OPTIONS="--assume-yes --no-install-recommends --only-upgrade"
6061
6162# # setup image labels
62- LABEL "com.github.image.title" ="$IMAGE_NAME" \
63+ LABEL "name" ="$IMAGE_NAME" \
64+ "version" ="$IMAGE_VERSION" \
65+ "com.github.image.title" ="$IMAGE_NAME" \
6366 "com.github.image.description" ="$IMAGE_DESCRIPTION" \
6467 "com.github.image.vendor" ="$IMAGE_VENDOR" \
6568 "com.github.image.url" ="$IMAGE_URL" \
@@ -72,7 +75,7 @@ LABEL "com.github.image.title"="$IMAGE_NAME" \
7275 "com.github.image.created" ="$IMAGE_BUILD_DATE"
7376
7477# # setup shell options
75- SHELL ["/bin/bash" , "-o " , "pipefail" , "-c" ]
78+ SHELL ["/bin/bash" , "-exo " , "pipefail" , "-c" ]
7679
7780# # setup environment variables
7881ENV PYTHON_VERSION=$PYTHON_VERSION \
@@ -82,16 +85,16 @@ ENV PYTHON_VERSION=$PYTHON_VERSION \
8285
8386ENV DEBIAN_FRONTEND=noninteractive \
8487 TERM="xterm" \
88+ PAGER=cat \
8589 TZ=UTC \
8690 LC_ALL="en_US.UTF-8" \
8791 LANG=$LC_ALL \
88- LANGUAGE=$LC_ALL \
89- LC_CTYPE=$LC_ALL
92+ LANGUAGE="en_US:en" \
93+ LC_CTYPE=$LC_ALL \
9094 PYTHONIOENCODING=UTF-8 \
9195 PYTHONLEGACYWINDOWSSTDIO=UTF-8 \
9296 PYTHONUNBUFFERED=1 \
9397 PYTHONDONTWRITEBYTECODE=1 \
94- DEBIAN_FRONTEND=noninteractive \
9598 APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 \
9699 PIP_DISABLE_PIP_VERSION_CHECK=1 \
97100 PIP_NO_CACHE_DIR=1 \
@@ -101,7 +104,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
101104 NODE_NO_WARNINGS='1' \
102105 NODE_TLS_REJECT_UNAUTHORIZED='0' \
103106 NODE_OPTIONS="--max-old-space-size=8192" \
104- IN_DOCKER=true
107+ IN_DOCKER=True
105108
106109ENV USER=${USER:-'devbot' } \
107110 UID=${UID:-5000} \
@@ -118,6 +121,11 @@ RUN adduser \
118121 "$USER" \
119122 || exit 0
120123
124+ # Run commands as user
125+ RUN whoami && \
126+ # opt-out of the new security feature, not needed in a CI environment
127+ git config --global --add safe.directory '*'
128+
121129# # mount volumes
122130VOLUME ["$APP_DIR" , "$DATA_DIR" , "$TEMP_DIR" ]
123131
@@ -129,7 +137,7 @@ RUN echo "**** Installing build packages ****"
129137# # RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
130138RUN apt-get update \
131139 && apt-get upgrade -yqq \
132- && apt-get install --assume-yes --no-install-recommends --only-upgrade $INSTALL_PACKAGES 2>&1 > /dev/null \
140+ && apt-get install $INSTALL_OPTIONS $INSTALL_PACKAGES 2>&1 > /dev/null \
133141 && apt-get -yqq autoclean \
134142 && apt-get -yqq clean \
135143 && apt-get -yqq autoremove \
0 commit comments