Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nginx layers, convert to FROM

Browse Source
This commit is contained in:
Disassembler 2019-11-30 09:59:32 +01:00
parent f8403c5f42
commit f82ad15689
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
41 changed files with 54 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lxc-apps/ckan/ckan-datapusher.lxcfile
View File

@ -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

4
lxc-apps/ckan/ckan.lxcfile
View File

@ -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

9
lxc-apps/crisiscleanup/lxcfile
View File

@ -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

9
lxc-apps/cts/lxcfile
View File

@ -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

9
lxc-apps/decidim/lxcfile
View File

@ -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

5
lxc-apps/ecogis/lxcfile
View File

@ -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

4
lxc-apps/frontlinesms/lxcfile
View File

@ -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

9
lxc-apps/gnuhealth/lxcfile
View File

@ -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

5
lxc-apps/kanboard/lxcfile
View File

@ -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

5
lxc-apps/mifosx/lxcfile
View File

@ -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

5
lxc-apps/motech/lxcfile
View File

@ -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

9
lxc-apps/odoo/lxcfile
View File

@ -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

9
lxc-apps/opendatakit/opendatakit-build.lxcfile
View File

@ -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

5
lxc-apps/opendatakit/opendatakit.lxcfile
View File

@ -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

11
lxc-apps/openmapkit/lxcfile
View File

@ -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

9
lxc-apps/pandora/lxcfile
View File

@ -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

9
lxc-apps/sahana/lxcfile
View File

@ -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

11
lxc-apps/seeddms/lxcfile
View File

@ -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

5
lxc-apps/sigmah/lxcfile
View File

@ -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

5
lxc-apps/ushahidi/lxcfile
View File

@ -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

4
lxc-services/activemq/lxcfile
View File

@ -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

3
lxc-services/mariadb/lxcfile
View File

@ -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)

4
lxc-services/postgis/lxcfile
View File

@ -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

3
lxc-services/postgres/lxcfile
View File

@ -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)

3
lxc-services/rabbitmq/lxcfile
View File

@ -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)

3
lxc-services/redis/lxcfile
View File

@ -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)

4
lxc-services/solr6/lxcfile
View File

@ -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

14
lxc-shared/alpine3.8-nginx/lxcfile
View File

@ -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;"

3
lxc-shared/alpine3.8-nodejs8/lxcfile
View File

@ -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

6
lxc-shared/alpine3.8-php5.6/lxcfile
View File

@ -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

3
lxc-shared/alpine3.8-ruby2.4/lxcfile
View File

@ -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

3
lxc-shared/alpine3.9-java8/lxcfile
View File

@ -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

14
lxc-shared/alpine3.9-nginx/lxcfile
View File

@ -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;"

3
lxc-shared/alpine3.9-nodejs10/lxcfile
View File

@ -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

6
lxc-shared/alpine3.9-php7.2/lxcfile
View File

@ -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

3
lxc-shared/alpine3.9-python2.7/lxcfile
View File

@ -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

3
lxc-shared/alpine3.9-python3.6/lxcfile
View File

@ -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

3
lxc-shared/alpine3.9-ruby2.4/lxcfile
View File

@ -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

3
lxc-shared/alpine3.9-ruby2.6/lxcfile
View File

@ -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

4
lxc-shared/alpine3.9-tomcat7/lxcfile
View File

@ -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

4
lxc-shared/alpine3.9-tomcat8.5/lxcfile
View File

@ -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