From f82ad15689ed04ddd4d9a0003b882e66f2a49c0d Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 30 Nov 2019 09:59:32 +0100 Subject: [PATCH] Remove nginx layers, convert to FROM --- lxc-apps/ckan/ckan-datapusher.lxcfile | 4 +--- lxc-apps/ckan/ckan.lxcfile | 4 +--- lxc-apps/crisiscleanup/lxcfile | 9 ++------- lxc-apps/cts/lxcfile | 9 ++------- lxc-apps/decidim/lxcfile | 9 ++------- lxc-apps/ecogis/lxcfile | 5 +---- lxc-apps/frontlinesms/lxcfile | 4 +--- lxc-apps/gnuhealth/lxcfile | 9 ++------- lxc-apps/kanboard/lxcfile | 5 +---- lxc-apps/mifosx/lxcfile | 5 +---- lxc-apps/motech/lxcfile | 5 +---- lxc-apps/odoo/lxcfile | 9 ++------- lxc-apps/opendatakit/opendatakit-build.lxcfile | 9 ++------- lxc-apps/opendatakit/opendatakit.lxcfile | 5 +---- lxc-apps/openmapkit/lxcfile | 11 ++++------- lxc-apps/pandora/lxcfile | 9 ++------- lxc-apps/sahana/lxcfile | 9 ++------- lxc-apps/seeddms/lxcfile | 11 +++-------- lxc-apps/sigmah/lxcfile | 5 +---- lxc-apps/ushahidi/lxcfile | 5 +---- lxc-services/activemq/lxcfile | 4 +--- lxc-services/mariadb/lxcfile | 3 +-- lxc-services/postgis/lxcfile | 4 +--- lxc-services/postgres/lxcfile | 3 +-- lxc-services/rabbitmq/lxcfile | 3 +-- lxc-services/redis/lxcfile | 3 +-- lxc-services/solr6/lxcfile | 4 +--- lxc-shared/alpine3.8-nginx/lxcfile | 14 -------------- lxc-shared/alpine3.8-nodejs8/lxcfile | 3 +-- lxc-shared/alpine3.8-php5.6/lxcfile | 6 ++---- lxc-shared/alpine3.8-ruby2.4/lxcfile | 3 +-- lxc-shared/alpine3.9-java8/lxcfile | 3 +-- lxc-shared/alpine3.9-nginx/lxcfile | 14 -------------- lxc-shared/alpine3.9-nodejs10/lxcfile | 3 +-- lxc-shared/alpine3.9-php7.2/lxcfile | 6 ++---- lxc-shared/alpine3.9-python2.7/lxcfile | 3 +-- lxc-shared/alpine3.9-python3.6/lxcfile | 3 +-- lxc-shared/alpine3.9-ruby2.4/lxcfile | 3 +-- lxc-shared/alpine3.9-ruby2.6/lxcfile | 3 +-- lxc-shared/alpine3.9-tomcat7/lxcfile | 4 +--- lxc-shared/alpine3.9-tomcat8.5/lxcfile | 4 +--- 41 files changed, 54 insertions(+), 183 deletions(-) delete mode 100644 lxc-shared/alpine3.8-nginx/lxcfile delete mode 100644 lxc-shared/alpine3.9-nginx/lxcfile diff --git a/lxc-apps/ckan/ckan-datapusher.lxcfile b/lxc-apps/ckan/ckan-datapusher.lxcfile index e9e94a3..6eee49f 100644 --- a/lxc-apps/ckan/ckan-datapusher.lxcfile +++ b/lxc-apps/ckan/ckan-datapusher.lxcfile @@ -1,7 +1,5 @@ IMAGE ckan-datapusher_0.0.13-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-python2.7_2.7.16-190620 +FROM alpine3.9-python2.7_2.7.16-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/ckan/ckan.lxcfile b/lxc-apps/ckan/ckan.lxcfile index 087b01c..6d120b0 100644 --- a/lxc-apps/ckan/ckan.lxcfile +++ b/lxc-apps/ckan/ckan.lxcfile @@ -1,7 +1,5 @@ IMAGE ckan_2.8.2-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-python2.7_2.7.16-190620 +FROM alpine3.9-python2.7_2.7.16-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/crisiscleanup/lxcfile b/lxc-apps/crisiscleanup/lxcfile index 373d7ac..7a2239f 100644 --- a/lxc-apps/crisiscleanup/lxcfile +++ b/lxc-apps/crisiscleanup/lxcfile @@ -1,16 +1,11 @@ IMAGE crisiscleanup_2.2.0-190620 - -LAYER alpine3.8_3.8.4-190620 -LAYER alpine3.8-ruby2.4_2.4.5-190620 -LAYER alpine3.8-nodejs8_8.14.0-190620 - -MERGE /usr/bin/lxcmerge +FROM alpine3.8-ruby2.4_2.4.5-190620 ENV RAILS_ENV production RUN EOF # Install runtime dependencies - apk --no-cache add libpq tzdata + apk --no-cache add libpq nodejs tzdata # Install build dependencies apk --no-cache add --virtual .deps build-base git libxml2-dev libxslt-dev linux-headers npm postgresql-dev yarn zlib-dev diff --git a/lxc-apps/cts/lxcfile b/lxc-apps/cts/lxcfile index c8163a0..a4ed6ef 100644 --- a/lxc-apps/cts/lxcfile +++ b/lxc-apps/cts/lxcfile @@ -1,14 +1,9 @@ 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 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-python2.7_2.7.16-190620 RUN EOF # Install runtime dependencies - apk --no-cache add geos@vm libpq zlib + apk --no-cache add geos@vm libpq nginx 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/decidim/lxcfile b/lxc-apps/decidim/lxcfile index de24a54..10ad503 100644 --- a/lxc-apps/decidim/lxcfile +++ b/lxc-apps/decidim/lxcfile @@ -1,10 +1,5 @@ IMAGE decidim_0.0.1-191113 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-ruby2.6_2.6.3-190620 -LAYER alpine3.9-nodejs10_10.14.2-190620 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-ruby2.6_2.6.3-190620 # https://github.com/Platoniq/decidim-install/blob/master/decidim-bionic.md # https://github.com/Platoniq/decidim-install/blob/master/basic-config.md @@ -13,7 +8,7 @@ ENV RAILS_ENV production RUN EOF # Install runtime dependencies - apk --no-cache add curl libpq pcre procps tzdata + apk --no-cache add curl libpq nodejs pcre procps tzdata # Install build dependencies apk --no-cache add --virtual .deps build-base curl-dev icu-dev libxml2-dev libxslt-dev linux-headers pcre-dev postgresql-dev zlib-dev diff --git a/lxc-apps/ecogis/lxcfile b/lxc-apps/ecogis/lxcfile index a496843..5094408 100644 --- a/lxc-apps/ecogis/lxcfile +++ b/lxc-apps/ecogis/lxcfile @@ -1,8 +1,5 @@ IMAGE ecogis_0.0.1-190620 - -LAYER alpine3.8_3.8.4-190620 -LAYER alpine3.8-nginx_1.14.2-191115 -LAYER alpine3.8-php5.6_5.6.40-190620 +FROM alpine3.8-php5.6_5.6.40-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/frontlinesms/lxcfile b/lxc-apps/frontlinesms/lxcfile index 35a0818..4cf1b18 100644 --- a/lxc-apps/frontlinesms/lxcfile +++ b/lxc-apps/frontlinesms/lxcfile @@ -1,7 +1,5 @@ IMAGE frontlinesms_2.6.5-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 +FROM alpine3.9-java8_8.212.04-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/gnuhealth/lxcfile b/lxc-apps/gnuhealth/lxcfile index 0ed42c1..b849fc1 100644 --- a/lxc-apps/gnuhealth/lxcfile +++ b/lxc-apps/gnuhealth/lxcfile @@ -1,14 +1,9 @@ IMAGE gnuhealth_3.4.1-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-python3.6_3.6.8-190620 -LAYER alpine3.9-nodejs10_10.14.2-190620 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-python3.6_3.6.8-190620 RUN EOF # Install runtime dependencies - apk --no-cache add bash coreutils libffi libjpeg-turbo libpq + apk --no-cache add bash coreutils libffi libjpeg-turbo libpq nodejs # Install build dependencies apk --no-cache add --virtual .deps build-base git libffi-dev libjpeg-turbo-dev libxml2-dev libxslt-dev ncurses npm patch postgresql-dev python3-dev sudo diff --git a/lxc-apps/kanboard/lxcfile b/lxc-apps/kanboard/lxcfile index 52b5875..8e8bc9c 100644 --- a/lxc-apps/kanboard/lxcfile +++ b/lxc-apps/kanboard/lxcfile @@ -1,8 +1,5 @@ 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 +FROM alpine3.9-php7.2_7.2.19-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/mifosx/lxcfile b/lxc-apps/mifosx/lxcfile index cdd15e8..ed41b0d 100644 --- a/lxc-apps/mifosx/lxcfile +++ b/lxc-apps/mifosx/lxcfile @@ -1,8 +1,5 @@ IMAGE mifosx_18.03.01-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 -LAYER alpine3.9-tomcat8.5_8.5.41-190620 +FROM alpine3.9-tomcat8.5_8.5.41-190620 RUN EOF # Install full-featured wget to work around sourceforge bugs diff --git a/lxc-apps/motech/lxcfile b/lxc-apps/motech/lxcfile index bbf3728..73933d2 100644 --- a/lxc-apps/motech/lxcfile +++ b/lxc-apps/motech/lxcfile @@ -1,8 +1,5 @@ IMAGE motech_1.3.0-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 -LAYER alpine3.9-tomcat7_7.0.94-190620 +FROM alpine3.9-tomcat7_7.0.94-190620 RUN EOF # Download Motech diff --git a/lxc-apps/odoo/lxcfile b/lxc-apps/odoo/lxcfile index bc9eff2..2eba772 100644 --- a/lxc-apps/odoo/lxcfile +++ b/lxc-apps/odoo/lxcfile @@ -1,14 +1,9 @@ IMAGE odoo_13.0.0-191113 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-python3.6_3.6.8-190620 -LAYER alpine3.9-nodejs10_10.14.2-190620 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-python3.6_3.6.8-190620 RUN EOF # Install runtime dependencies - apk --no-cache add libjpeg-turbo libpq + apk --no-cache add libjpeg-turbo libpq nodejs # Install build dependencies apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev linux-headers openldap-dev postgresql-dev python3-dev diff --git a/lxc-apps/opendatakit/opendatakit-build.lxcfile b/lxc-apps/opendatakit/opendatakit-build.lxcfile index 1353a09..a2f53ff 100644 --- a/lxc-apps/opendatakit/opendatakit-build.lxcfile +++ b/lxc-apps/opendatakit/opendatakit-build.lxcfile @@ -1,14 +1,9 @@ IMAGE opendatakit-build_0.3.5-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-ruby2.4_2.4.5-190620 -LAYER alpine3.9-nodejs10_10.14.2-190620 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-ruby2.4_2.4.5-190620 RUN EOF # Install runtime dependencies - apk --no-cache add libpq + apk --no-cache add libpq nodejs # Install build dependencies apk --no-cache add --virtual .deps build-base git linux-headers make npm openjdk8-jre-base postgresql-dev diff --git a/lxc-apps/opendatakit/opendatakit.lxcfile b/lxc-apps/opendatakit/opendatakit.lxcfile index 931c494..bd4b181 100644 --- a/lxc-apps/opendatakit/opendatakit.lxcfile +++ b/lxc-apps/opendatakit/opendatakit.lxcfile @@ -1,8 +1,5 @@ IMAGE opendatakit_2.0.3-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 -LAYER alpine3.9-tomcat8.5_8.5.41-190620 +FROM alpine3.9-tomcat8.5_8.5.41-190620 RUN EOF # Download OpenDataKit diff --git a/lxc-apps/openmapkit/lxcfile b/lxc-apps/openmapkit/lxcfile index 7b6db89..d30734e 100644 --- a/lxc-apps/openmapkit/lxcfile +++ b/lxc-apps/openmapkit/lxcfile @@ -1,13 +1,10 @@ IMAGE openmapkit_0.12.0-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 -LAYER alpine3.9-python2.7_2.7.16-190620 -LAYER alpine3.9-nodejs10_10.14.2-190620 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-java8_8.212.04-190620 RUN EOF + # Install runtime dependencies + apk --no-cache add python2 nodejs + # Install build dependencies apk --no-cache add --virtual .deps build-base git py2-pip yarn diff --git a/lxc-apps/pandora/lxcfile b/lxc-apps/pandora/lxcfile index c0a3cd3..1abeff5 100644 --- a/lxc-apps/pandora/lxcfile +++ b/lxc-apps/pandora/lxcfile @@ -1,14 +1,9 @@ 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 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-python3.6_3.6.8-190620 RUN EOF # Install runtime dependencies - apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix poppler-utils py3-geoip py3-lxml py3-numpy py3-pillow py3-psycopg2 + apk --no-cache add ffmpeg imagemagick imlib2 libogg libtheora libvpx mkvtoolnix nginx 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 10bfec2..36c937f 100644 --- a/lxc-apps/sahana/lxcfile +++ b/lxc-apps/sahana/lxcfile @@ -1,14 +1,9 @@ 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 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-python2.7_2.7.16-190620 RUN EOF # Install runtime dependencies - apk --no-cache add geos@vm py-gdal@vm py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python + apk --no-cache add geos@vm nginx 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 d1231bf..6fb8219 100644 --- a/lxc-apps/seeddms/lxcfile +++ b/lxc-apps/seeddms/lxcfile @@ -1,15 +1,10 @@ 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 - -MERGE /usr/bin/lxcmerge +FROM alpine3.9-php7.2_7.2.19-190620 RUN EOF # Install runtime dependencies - apk --no-cache add ghostscript imagemagick libreoffice-calc libreoffice-impress libreoffice-writer php7-fileinfo php7-iconv php7-openssl php7-pear php7-pdo_pgsql php7-simplexml php7-xml poppler-utils ttf-opensans + apk --no-cache add ghostscript imagemagick libreoffice-calc libreoffice-impress libreoffice-writer php7-fileinfo php7-iconv php7-openssl php7-pear php7-pdo_pgsql php7-simplexml php7-xml poppler-utils python3 ttf-opensans + ln -s /usr/bin/python3 /usr/bin/python # Install unoconv wget https://raw.githubusercontent.com/dagwieers/unoconv/master/unoconv -O /usr/bin/unoconv diff --git a/lxc-apps/sigmah/lxcfile b/lxc-apps/sigmah/lxcfile index 15692a2..f581169 100644 --- a/lxc-apps/sigmah/lxcfile +++ b/lxc-apps/sigmah/lxcfile @@ -1,8 +1,5 @@ IMAGE sigmah_2.0.2-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 -LAYER alpine3.9-tomcat8.5_8.5.41-190620 +FROM alpine3.9-tomcat8.5_8.5.41-190620 RUN EOF # Download Sigmah diff --git a/lxc-apps/ushahidi/lxcfile b/lxc-apps/ushahidi/lxcfile index ead789e..a6e81bc 100644 --- a/lxc-apps/ushahidi/lxcfile +++ b/lxc-apps/ushahidi/lxcfile @@ -1,8 +1,5 @@ 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 +FROM alpine3.9-php7.2_7.2.19-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-services/activemq/lxcfile b/lxc-services/activemq/lxcfile index 7a76154..717c741 100644 --- a/lxc-services/activemq/lxcfile +++ b/lxc-services/activemq/lxcfile @@ -1,7 +1,5 @@ IMAGE activemq_5.15.9-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 +FROM alpine3.9-java8_8.212.04-190620 RUN EOF # Download and install ActiveMQ diff --git a/lxc-services/mariadb/lxcfile b/lxc-services/mariadb/lxcfile index 40835e1..cbeccd8 100644 --- a/lxc-services/mariadb/lxcfile +++ b/lxc-services/mariadb/lxcfile @@ -1,6 +1,5 @@ IMAGE mariadb_10.3.15-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/postgis/lxcfile b/lxc-services/postgis/lxcfile index 786130f..5da3e3a 100644 --- a/lxc-services/postgis/lxcfile +++ b/lxc-services/postgis/lxcfile @@ -1,7 +1,5 @@ IMAGE postgis_2.5.1-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER postgres_11.3.0-190620 +FROM postgres_11.3.0-190620 RUN EOF # Install PostGIS diff --git a/lxc-services/postgres/lxcfile b/lxc-services/postgres/lxcfile index 96b0976..9ffe4c2 100644 --- a/lxc-services/postgres/lxcfile +++ b/lxc-services/postgres/lxcfile @@ -1,6 +1,5 @@ IMAGE postgres_11.3.0-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # Modify OS user (which will be picked up later by apk add) diff --git a/lxc-services/rabbitmq/lxcfile b/lxc-services/rabbitmq/lxcfile index 187e594..7b64bbb 100644 --- a/lxc-services/rabbitmq/lxcfile +++ b/lxc-services/rabbitmq/lxcfile @@ -1,6 +1,5 @@ IMAGE rabbitmq_3.7.11-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/redis/lxcfile b/lxc-services/redis/lxcfile index 15cb56c..2d70ce2 100644 --- a/lxc-services/redis/lxcfile +++ b/lxc-services/redis/lxcfile @@ -1,6 +1,5 @@ IMAGE redis_4.0.12-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/solr6/lxcfile b/lxc-services/solr6/lxcfile index 3acd37b..8f797d6 100644 --- a/lxc-services/solr6/lxcfile +++ b/lxc-services/solr6/lxcfile @@ -1,7 +1,5 @@ IMAGE solr6_6.5.1-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 +FROM alpine3.9-java8_8.212.04-190620 RUN EOF # Install runtime dependencies diff --git a/lxc-shared/alpine3.8-nginx/lxcfile b/lxc-shared/alpine3.8-nginx/lxcfile deleted file mode 100644 index 77d9d4a..0000000 --- a/lxc-shared/alpine3.8-nginx/lxcfile +++ /dev/null @@ -1,14 +0,0 @@ -IMAGE alpine3.8-nginx_1.14.2-191115 - -LAYER alpine3.8_3.8.4-190620 - -RUN EOF - # Add nginx user (which will be picked up later by apk add) - addgroup -Sg 1080 nginx 2>/dev/null - adduser -Su 1080 -D -H -h /var/lib/nginx -s /sbin/nologin -G nginx -g nginx nginx 2>/dev/null - - # Install nginx - apk --no-cache add nginx -EOF - -CMD nginx -g "daemon off;" diff --git a/lxc-shared/alpine3.8-nodejs8/lxcfile b/lxc-shared/alpine3.8-nodejs8/lxcfile index c169d26..7ba3495 100644 --- a/lxc-shared/alpine3.8-nodejs8/lxcfile +++ b/lxc-shared/alpine3.8-nodejs8/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.8-nodejs8_8.14.0-190620 - -LAYER alpine3.8_3.8.4-190620 +FROM alpine3.8_3.8.4-190620 RUN EOF apk --no-cache add nodejs diff --git a/lxc-shared/alpine3.8-php5.6/lxcfile b/lxc-shared/alpine3.8-php5.6/lxcfile index 4446fad..340a927 100644 --- a/lxc-shared/alpine3.8-php5.6/lxcfile +++ b/lxc-shared/alpine3.8-php5.6/lxcfile @@ -1,10 +1,8 @@ IMAGE alpine3.8-php5.6_5.6.40-190620 - -LAYER alpine3.8_3.8.4-190620 -LAYER alpine3.8-nginx_1.14.2-191115 +FROM alpine3.8_3.8.4-190620 RUN EOF - apk --no-cache add php5 php5-ctype php5-fpm php5-gd php5-json php5-mcrypt php5-opcache + apk --no-cache add nginx php5 php5-ctype php5-fpm php5-gd php5-json php5-mcrypt php5-opcache ln -s /usr/bin/php5 /usr/bin/php EOF diff --git a/lxc-shared/alpine3.8-ruby2.4/lxcfile b/lxc-shared/alpine3.8-ruby2.4/lxcfile index 1327a28..092737a 100644 --- a/lxc-shared/alpine3.8-ruby2.4/lxcfile +++ b/lxc-shared/alpine3.8-ruby2.4/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.8-ruby2.4_2.4.5-190620 - -LAYER alpine3.8_3.8.4-190620 +FROM alpine3.8_3.8.4-190620 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.9-java8/lxcfile b/lxc-shared/alpine3.9-java8/lxcfile index 8aa0376..01a0f8b 100644 --- a/lxc-shared/alpine3.9-java8/lxcfile +++ b/lxc-shared/alpine3.9-java8/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.9-java8_8.212.04-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # nss needed due to https://github.com/docker-library/openjdk/issues/289 , https://bugs.alpinelinux.org/issues/10126 diff --git a/lxc-shared/alpine3.9-nginx/lxcfile b/lxc-shared/alpine3.9-nginx/lxcfile deleted file mode 100644 index 6f1df3d..0000000 --- a/lxc-shared/alpine3.9-nginx/lxcfile +++ /dev/null @@ -1,14 +0,0 @@ -IMAGE alpine3.9-nginx_1.14.2-191115 - -LAYER alpine3.9_3.9.4-190620 - -RUN EOF - # Add nginx user (which will be picked up later by apk add) - addgroup -Sg 1080 nginx 2>/dev/null - adduser -Su 1080 -D -H -h /var/lib/nginx -s /sbin/nologin -G nginx -g nginx nginx 2>/dev/null - - # Install nginx - apk --no-cache add nginx -EOF - -CMD nginx -g "daemon off;" diff --git a/lxc-shared/alpine3.9-nodejs10/lxcfile b/lxc-shared/alpine3.9-nodejs10/lxcfile index 6d7b5db..8b4a0ce 100644 --- a/lxc-shared/alpine3.9-nodejs10/lxcfile +++ b/lxc-shared/alpine3.9-nodejs10/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.9-nodejs10_10.14.2-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF apk --no-cache add nodejs diff --git a/lxc-shared/alpine3.9-php7.2/lxcfile b/lxc-shared/alpine3.9-php7.2/lxcfile index 810051c..8c8108f 100644 --- a/lxc-shared/alpine3.9-php7.2/lxcfile +++ b/lxc-shared/alpine3.9-php7.2/lxcfile @@ -1,10 +1,8 @@ IMAGE alpine3.9-php7.2_7.2.19-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-nginx_1.14.2-191115 +FROM alpine3.9_3.9.4-190620 RUN EOF - apk --no-cache add php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session + apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session EOF CMD php -a diff --git a/lxc-shared/alpine3.9-python2.7/lxcfile b/lxc-shared/alpine3.9-python2.7/lxcfile index e37b81e..247782f 100644 --- a/lxc-shared/alpine3.9-python2.7/lxcfile +++ b/lxc-shared/alpine3.9-python2.7/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.9-python2.7_2.7.16-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF apk --no-cache add python2 diff --git a/lxc-shared/alpine3.9-python3.6/lxcfile b/lxc-shared/alpine3.9-python3.6/lxcfile index a8b3f3d..6e4f217 100644 --- a/lxc-shared/alpine3.9-python3.6/lxcfile +++ b/lxc-shared/alpine3.9-python3.6/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.9-python3.6_3.6.8-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF apk --no-cache add python3 diff --git a/lxc-shared/alpine3.9-ruby2.4/lxcfile b/lxc-shared/alpine3.9-ruby2.4/lxcfile index aa37e4e..e466e16 100644 --- a/lxc-shared/alpine3.9-ruby2.4/lxcfile +++ b/lxc-shared/alpine3.9-ruby2.4/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.9-ruby2.4_2.4.5-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.9-ruby2.6/lxcfile b/lxc-shared/alpine3.9-ruby2.6/lxcfile index 00b3148..b1309a1 100644 --- a/lxc-shared/alpine3.9-ruby2.6/lxcfile +++ b/lxc-shared/alpine3.9-ruby2.6/lxcfile @@ -1,6 +1,5 @@ IMAGE alpine3.9-ruby2.6_2.6.3-190620 - -LAYER alpine3.9_3.9.4-190620 +FROM alpine3.9_3.9.4-190620 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.9-tomcat7/lxcfile b/lxc-shared/alpine3.9-tomcat7/lxcfile index da4cb3b..b07e933 100644 --- a/lxc-shared/alpine3.9-tomcat7/lxcfile +++ b/lxc-shared/alpine3.9-tomcat7/lxcfile @@ -1,7 +1,5 @@ IMAGE alpine3.9-tomcat7_7.0.94-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 +FROM alpine3.9-java8_8.212.04-190620 RUN EOF # Install Tomcat 7 diff --git a/lxc-shared/alpine3.9-tomcat8.5/lxcfile b/lxc-shared/alpine3.9-tomcat8.5/lxcfile index 9010118..757cc45 100644 --- a/lxc-shared/alpine3.9-tomcat8.5/lxcfile +++ b/lxc-shared/alpine3.9-tomcat8.5/lxcfile @@ -1,7 +1,5 @@ IMAGE alpine3.9-tomcat8.5_8.5.41-190620 - -LAYER alpine3.9_3.9.4-190620 -LAYER alpine3.9-java8_8.212.04-190620 +FROM alpine3.9-java8_8.212.04-190620 RUN EOF # Install Tomcat 8.5