cosmetic changes using variables for all packages

This commit is contained in:
sparklyballs 2018-04-04 09:48:15 +01:00
parent 17bc60c5bc
commit 791d38dc3b

View File

@ -16,7 +16,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
ARG GRAFANA_VER="4.1.2-1486989747" ARG GRAFANA_VER="4.1.2-1486989747"
ARG INFLUX_VER="1.2.0" ARG INFLUX_VER="1.2.0"
# build packages as variable # packages as variables
ARG BUILD_PACKAGES="\ ARG BUILD_PACKAGES="\
g++ \ g++ \
gcc \ gcc \
@ -24,7 +24,14 @@ ARG BUILD_PACKAGES="\
make \ make \
ruby-dev \ ruby-dev \
wget" wget"
ARG RUNTIME_PACKAGES="\
cron \
libfontconfig1 \
libfreetype6 \
libpng12-0 \
netcat \
ruby \
wget"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apt-get update && \ apt-get update && \
@ -43,13 +50,7 @@ RUN \
echo "****install runtime packages ****" && \ echo "****install runtime packages ****" && \
apt-get install -y \ apt-get install -y \
--no-install-recommends \ --no-install-recommends \
cron \ $RUNTIME_PACKAGES && \
libfontconfig1 \
libfreetype6 \
libpng12-0 \
netcat \
ruby \
wget && \
echo "**** install influxdb and grafana ****" && \ echo "**** install influxdb and grafana ****" && \
curl -o \ curl -o \
/tmp/influxdb.deb \ /tmp/influxdb.deb \