37177c64 by Adam Heath

Add _EXTRA_PACKAGES support during build.

1 parent eb580602
1 FROM debian:stretch 1 FROM debian:stretch
2 2
3 ARG NGINX_EXTRA_PACKAGES
4
3 COPY files/ /tmp/files/ 5 COPY files/ /tmp/files/
4 RUN /tmp/files/configure 6 RUN /tmp/files/configure
5 7
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 2
3 set -e 3 set -e
4 apt-get update 4 apt-get update
5 apt-get install -y ssmtp nginx libnginx-mod-http-subs-filter 5 apt-get install -y ssmtp nginx libnginx-mod-http-subs-filter $NGINX_EXTRA_PACKAGES
6 rm /etc/nginx/sites-enabled/default 6 rm /etc/nginx/sites-enabled/default
7 cp -a /tmp/files/entrypoint.sh /sbin 7 cp -a /tmp/files/entrypoint.sh /sbin
......
1 FROM node 1 FROM node
2 2
3 ARG NODE_EXTRA_PACKAGES
4
3 COPY files/ /tmp/files/ 5 COPY files/ /tmp/files/
4 RUN /tmp/files/configure 6 RUN /tmp/files/configure
5 7
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 set -e 3 set -e
4 apt-get update 4 apt-get update
5 apt-get install -y ssmtp sudo 5 apt-get install -y ssmtp sudo $NODE_EXTRA_PACKAGES
6 #npm install -g gulp grunt 6 #npm install -g gulp grunt
7 7
8 cp /tmp/files/entrypoint /root/entrypoint 8 cp /tmp/files/entrypoint /root/entrypoint
......
1 FROM debian:stretch 1 FROM debian:stretch
2 2
3 ARG PHPFPM_EXTRA_PACKAGES
4
3 COPY files/ /tmp/files/ 5 COPY files/ /tmp/files/
4 RUN /tmp/files/configure 6 RUN /tmp/files/configure
5 7
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 2
3 set -e 3 set -e
4 apt-get update 4 apt-get update
5 apt-get install -y sudo ssmtp php7.0-fpm php7.0-mysql php7.0-imagick php7.0-ldap php7.0-xml php7.0-mbstring php7.0-mcrypt php7.0-gd php7.0-apc git ffmpeg ghostscript 5 apt-get install -y sudo ssmtp php7.0-fpm php7.0-mysql php7.0-imagick php7.0-ldap php7.0-xml php7.0-mbstring php7.0-mcrypt php7.0-gd php7.0-apc $PHPFPM_EXTRA_PACKAGES
6 6
7 rm /etc/php/7.0/fpm/pool.d/www.conf 7 rm /etc/php/7.0/fpm/pool.d/www.conf
8 cp -a /tmp/files/app-defaults.conf /etc/php/7.0/fpm 8 cp -a /tmp/files/app-defaults.conf /etc/php/7.0/fpm
......