diff --git a/lxc-apps/cts/lxcfile b/lxc-apps/cts/lxcfile index d866058..7e99e9a 100644 --- a/lxc-apps/cts/lxcfile +++ b/lxc-apps/cts/lxcfile @@ -2,10 +2,13 @@ IMAGE cts_0.8.0-190620 LAYER alpine3.9_3.9.4-190620 LAYER alpine3.9-python2.7_2.7.16-190620 +LAYER alpine3.9-nginx_1.14.2-191115 + +FIXLAYER /usr/bin/fix-apk RUN EOF # Install runtime dependencies - apk --no-cache add geos@vm libpq nginx zlib + apk --no-cache add geos@vm libpq zlib # Install build dependencies apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev diff --git a/lxc-apps/kanboard/lxcfile b/lxc-apps/kanboard/lxcfile index 45f7870..52b5875 100644 --- a/lxc-apps/kanboard/lxcfile +++ b/lxc-apps/kanboard/lxcfile @@ -1,6 +1,7 @@ IMAGE kanboard_1.2.9-190620 LAYER alpine3.9_3.9.4-190620 +LAYER alpine3.9-nginx_1.14.2-191115 LAYER alpine3.9-php7.2_7.2.19-190620 RUN EOF diff --git a/lxc-apps/pandora/lxcfile b/lxc-apps/pandora/lxcfile index 3f757e3..ce920d3 100644 --- a/lxc-apps/pandora/lxcfile +++ b/lxc-apps/pandora/lxcfile @@ -2,10 +2,13 @@ IMAGE pandora_0.0.1-190620 LAYER alpine3.9_3.9.4-190620 LAYER alpine3.9-python3.6_3.6.8-190620 +LAYER alpine3.9-nginx_1.14.2-191115 + +FIXLAYER /usr/bin/fix-apk RUN EOF # Install runtime dependencies - apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix nginx poppler-utils py3-geoip py3-lxml py3-numpy py3-pillow py3-psycopg2 + apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix poppler-utils py3-geoip py3-lxml py3-numpy py3-pillow py3-psycopg2 pip3 install pyinotify # Install build dependencies diff --git a/lxc-apps/sahana/lxcfile b/lxc-apps/sahana/lxcfile index fba0ac2..c92402c 100644 --- a/lxc-apps/sahana/lxcfile +++ b/lxc-apps/sahana/lxcfile @@ -2,10 +2,13 @@ IMAGE sahana_0.0.1-190620 LAYER alpine3.9_3.9.4-190620 LAYER alpine3.9-python2.7_2.7.16-190620 +LAYER alpine3.9-nginx_1.14.2-191115 + +FIXLAYER /usr/bin/fix-apk RUN EOF # Install runtime dependencies - apk --no-cache add geos@vm nginx py-gdal@vm py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python + apk --no-cache add geos@vm py-gdal@vm py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python # Install build dependencies apk --no-cache add --virtual .deps build-base git freetype-dev libpng-dev py-numpy-dev py2-pip python2-dev ttf-dejavu diff --git a/lxc-apps/seeddms/lxcfile b/lxc-apps/seeddms/lxcfile index 98c4c60..52ea6d6 100644 --- a/lxc-apps/seeddms/lxcfile +++ b/lxc-apps/seeddms/lxcfile @@ -1,6 +1,7 @@ IMAGE seeddms_5.1.9-190620 LAYER alpine3.9_3.9.4-190620 +LAYER alpine3.9-nginx_1.14.2-191115 LAYER alpine3.9-php7.2_7.2.19-190620 LAYER alpine3.9-python3.6_3.6.8-190620 diff --git a/lxc-apps/ushahidi/lxcfile b/lxc-apps/ushahidi/lxcfile index 4f36744..ead789e 100644 --- a/lxc-apps/ushahidi/lxcfile +++ b/lxc-apps/ushahidi/lxcfile @@ -1,6 +1,7 @@ IMAGE ushahidi_3.12.3-190620 LAYER alpine3.9_3.9.4-190620 +LAYER alpine3.9-nginx_1.14.2-191115 LAYER alpine3.9-php7.2_7.2.19-190620 RUN EOF diff --git a/lxc-shared/alpine3.9-nginx/lxcfile b/lxc-shared/alpine3.9-nginx/lxcfile new file mode 100644 index 0000000..097d36b --- /dev/null +++ b/lxc-shared/alpine3.9-nginx/lxcfile @@ -0,0 +1,9 @@ +IMAGE alpine3.9-nginx_1.14.2-191115 + +LAYER alpine3.9_3.9.4-190620 + +RUN EOF + apk --no-cache add nginx +EOF + +CMD nginx -g "daemon off;" diff --git a/lxc-shared/alpine3.9-php7.2/lxcfile b/lxc-shared/alpine3.9-php7.2/lxcfile index 0e935b4..810051c 100644 --- a/lxc-shared/alpine3.9-php7.2/lxcfile +++ b/lxc-shared/alpine3.9-php7.2/lxcfile @@ -1,9 +1,10 @@ IMAGE alpine3.9-php7.2_7.2.19-190620 LAYER alpine3.9_3.9.4-190620 +LAYER alpine3.9-nginx_1.14.2-191115 RUN EOF - apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session + apk --no-cache add php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session EOF CMD php -a