openstack/monasca-common
Code Issues Proposed changes

Merge "Remove Linux apps pinning from Dockerfile"

Browse Source
This commit is contained in:
Zuul 2018-11-20 11:54:00 +00:00 committed by Gerrit Code Review
commit d77a54053e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/Dockerfile
View File

@ -25,10 +25,10 @@ LABEL org.opencontainers.image.licenses="Apache-2.0"
RUN \ RUN \
chmod +x /wait_for.sh /kafka_wait_for_topics.py /mysql_check.py && \ chmod +x /wait_for.sh /kafka_wait_for_topics.py /mysql_check.py && \
apk add --no-cache \ apk add --no-cache \
su-exec=0.2-r0 \ su-exec \
tini=0.16.1-r0 \ tini \
# We need this to allow users choose different time zone. # We need this to allow users choose different time zone.
tzdata=2017c-r0 && \ tzdata && \
printf "Monasca base build date: %s\\n" $BASE_CREATION_TIME >> /VERSIONS && \ printf "Monasca base build date: %s\\n" $BASE_CREATION_TIME >> /VERSIONS && \
printf "Monasca base revision: %s\\n" $BASE_GIT_COMMIT >> /VERSIONS && \ printf "Monasca base revision: %s\\n" $BASE_GIT_COMMIT >> /VERSIONS && \
# Cleaning. # Cleaning.
@ -75,12 +75,12 @@ ONBUILD SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
ONBUILD RUN \ ONBUILD RUN \
chmod +x /start.sh && \ chmod +x /start.sh && \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
g++=6.4.0-r5 \ g++ \
git=2.15.2-r0 \ git \
libffi-dev=3.2.1-r4 \ libffi-dev \
libressl-dev=2.6.5-r0 \ libressl-dev \
linux-headers=4.4.6-r2 \ linux-headers \
make=4.2.1-r0 && \ make && \
# Clone repository and checkout requested version. # Clone repository and checkout requested version.
# This many steps are needed to support gerrit patch sets. # This many steps are needed to support gerrit patch sets.
mkdir -p /app && \ mkdir -p /app && \