From 0bae44985c29b32083f332c51669ce2ac9a7a782 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sat, 4 Apr 2020 00:17:24 +0200 Subject: [PATCH] Bump Alpine to 3.11.5 + all apps --- apk/spoc | 2 +- apk/vmmgr | 2 +- build/build-all.sh | 7 +++++-- build/clean-all.sh | 2 +- build/install-toolchain.sh | 2 +- lxc-apps/ckan/app | 12 ++++++------ lxc-apps/ckan/ckan-datapusher.image | 4 ++-- lxc-apps/ckan/ckan.image | 4 ++-- lxc-apps/ckan/install.sh | 2 +- lxc-apps/crisiscleanup/app | 6 +++--- lxc-apps/crisiscleanup/image | 4 ++-- lxc-apps/crisiscleanup/install.sh | 2 +- lxc-apps/cts/app | 6 +++--- lxc-apps/cts/image | 4 ++-- lxc-apps/cts/install.sh | 2 +- lxc-apps/decidim/app | 6 +++--- lxc-apps/decidim/image | 6 +++--- lxc-apps/decidim/image.d/srv/decidim-app/Gemfile | 8 ++++---- lxc-apps/decidim/install.sh | 2 +- lxc-apps/ecogis/app | 4 ++-- lxc-apps/ecogis/image | 4 ++-- lxc-apps/frontlinesms/app | 4 ++-- lxc-apps/frontlinesms/image | 4 ++-- lxc-apps/gnuhealth/app | 6 +++--- lxc-apps/gnuhealth/image | 4 ++-- lxc-apps/kanboard/app | 6 +++--- lxc-apps/kanboard/image | 4 ++-- lxc-apps/mifosx/app | 6 +++--- lxc-apps/mifosx/image | 4 ++-- lxc-apps/motech/app | 8 ++++---- lxc-apps/motech/image | 4 ++-- lxc-apps/odoo/app | 6 +++--- lxc-apps/odoo/image | 4 ++-- lxc-apps/opendatakit/app | 8 ++++---- lxc-apps/opendatakit/opendatakit-build.image | 4 ++-- lxc-apps/opendatakit/opendatakit.image | 4 ++-- lxc-apps/openmapkit/app | 4 ++-- lxc-apps/openmapkit/image | 4 ++-- lxc-apps/openmapkit/install.sh | 2 +- lxc-apps/pandora/app | 8 ++++---- lxc-apps/pandora/image | 4 ++-- lxc-apps/sahana-demo/app | 6 +++--- lxc-apps/sahana-demo/install.sh | 2 +- lxc-apps/sahana/app | 6 +++--- lxc-apps/sahana/image | 4 ++-- lxc-apps/sahana/install.sh | 2 +- lxc-apps/sambro/app | 6 +++--- lxc-apps/sambro/install.sh | 2 +- lxc-apps/seeddms/app | 6 +++--- lxc-apps/seeddms/image | 4 ++-- lxc-apps/seeddms/install.sh | 2 +- lxc-apps/sigmah/app | 6 +++--- lxc-apps/sigmah/image | 4 ++-- lxc-apps/sigmah/install.sh | 2 +- lxc-apps/ushahidi/app | 8 ++++---- lxc-apps/ushahidi/image | 6 +++--- lxc-services/activemq/image | 4 ++-- lxc-services/mariadb/image | 4 ++-- lxc-services/postgis/image | 4 ++-- lxc-services/postgres/image | 4 ++-- lxc-services/rabbitmq/image | 4 ++-- lxc-services/redis/image | 4 ++-- lxc-services/solr6/image | 4 ++-- lxc-shared/alpine3.10-nodejs10/image | 4 ++-- lxc-shared/alpine3.10-python2.7/image | 4 ++-- lxc-shared/alpine3.10-python3.7/image | 4 ++-- lxc-shared/alpine3.10/image | 2 +- lxc-shared/alpine3.11-java8/image | 4 ++-- lxc-shared/alpine3.11-php7.3/image | 4 ++-- lxc-shared/alpine3.11-python2.7/image | 4 ++-- lxc-shared/alpine3.11-python3.8/image | 4 ++-- lxc-shared/alpine3.11-ruby2.4/image | 4 ++-- lxc-shared/alpine3.11-ruby2.6/image | 4 ++-- lxc-shared/alpine3.11-tomcat7/image | 6 +++--- lxc-shared/alpine3.11-tomcat8.5/image | 6 +++--- lxc-shared/alpine3.11/image | 4 ++-- lxc-shared/alpine3.8-java8/image | 4 ++-- lxc-shared/alpine3.8-php5.6/image | 4 ++-- lxc-shared/alpine3.8-ruby2.4/image | 4 ++-- lxc-shared/alpine3.8/image | 2 +- vm.sh | 2 +- 81 files changed, 178 insertions(+), 175 deletions(-) diff --git a/apk/spoc b/apk/spoc index d4bbce2..55ee030 160000 --- a/apk/spoc +++ b/apk/spoc @@ -1 +1 @@ -Subproject commit d4bbce2dcf5ae73bfa22e6ce3a9c09b507857fb4 +Subproject commit 55ee03079fc8c6d0f5f74a734943b76b6f0ed929 diff --git a/apk/vmmgr b/apk/vmmgr index f5501c0..be054ed 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit f5501c0605b644494ba55802fdd5a5d15a25dd06 +Subproject commit be054ed17b0f3071603869e75a1a8ccc04695184 diff --git a/build/build-all.sh b/build/build-all.sh index 2482e55..6dd84c1 100755 --- a/build/build-all.sh +++ b/build/build-all.sh @@ -29,10 +29,13 @@ abuild -F # Build runtimes cd ${ROOT}/lxc-shared spoc-image build -p alpine3.8/image +spoc-image build -p alpine3.8-java8/image spoc-image build -p alpine3.8-php5.6/image spoc-image build -p alpine3.8-ruby2.4/image spoc-image build -p alpine3.10/image +spoc-image build -p alpine3.10-nodejs10/image spoc-image build -p alpine3.10-python2.7/image +spoc-image build -p alpine3.10-python3.7/image spoc-image build -p alpine3.11/image spoc-image build -p alpine3.11-java8/image spoc-image build -p alpine3.11-php7.3/image @@ -90,8 +93,8 @@ spoc-app publish motech/app spoc-image build -p odoo/image spoc-app publish odoo/app -spoc-image build -p opendatakit/image -spoc-image build -p opendatakit-build/image +spoc-image build -p opendatakit/opendatakit.image +spoc-image build -p opendatakit/opendatakit-build.image spoc-app publish opendatakit/app spoc-image build -p openmapkit/image diff --git a/build/clean-all.sh b/build/clean-all.sh index 1d35898..94d01ca 100755 --- a/build/clean-all.sh +++ b/build/clean-all.sh @@ -5,7 +5,7 @@ set -ev rm -rf /srv/build/doc/* # Clean basic tar -rm -f /srv/build/vm.tar +rm -f /srv/build/vm.tar.gz # Clean native apps rm -rf /srv/build/alpine/* diff --git a/build/install-toolchain.sh b/build/install-toolchain.sh index 7bc50c9..53b6d75 100755 --- a/build/install-toolchain.sh +++ b/build/install-toolchain.sh @@ -5,7 +5,7 @@ cd $(realpath $(dirname "${0}")) # Install basic build tools apk update -apk add git file htop less openssh-client +apk add git file htop less openssh-client tree # Install Alpine SDK apk add alpine-sdk # Install Sphinx support diff --git a/lxc-apps/ckan/app b/lxc-apps/ckan/app index d666e51..320a7ae 100644 --- a/lxc-apps/ckan/app +++ b/lxc-apps/ckan/app @@ -1,5 +1,5 @@ { - "version": "2.8.3-200313", + "version": "2.8.3-200403", "meta": { "title": "CKAN", "desc-cs": "Datový sklad", @@ -8,7 +8,7 @@ }, "containers": { "ckan": { - "image": "ckan_2.8.3-200313", + "image": "ckan_2.8.3-200403", "depends": [ "ckan-datapusher", "ckan-redis", @@ -21,27 +21,27 @@ } }, "ckan-datapusher": { - "image": "ckan-datapusher_0.0.16-200313", + "image": "ckan-datapusher_0.0.16-200403", "mounts": { "ckan/datapusher_conf": "etc/ckan-datapusher", "ckan/datapusher_data": "srv/ckan-datapusher/data" } }, "ckan-redis": { - "image": "redis_5.0.7-200313", + "image": "redis_5.0.7-200403", "mounts": { "ckan/redis_conf/redis.conf": "etc/redis.conf:file", "ckan/redis_data": "var/lib/redis" } }, "ckan-solr": { - "image": "solr6_6.5.1-200313", + "image": "solr6_6.5.1-200403", "mounts": { "ckan/solr_data": "var/lib/solr" } }, "ckan-postgres": { - "image": "postgis_3.0.0-200313", + "image": "postgis_3.0.0-200403", "mounts": { "ckan/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/ckan/ckan-datapusher.image b/lxc-apps/ckan/ckan-datapusher.image index 9cd95c2..c4803cb 100644 --- a/lxc-apps/ckan/ckan-datapusher.image +++ b/lxc-apps/ckan/ckan-datapusher.image @@ -1,5 +1,5 @@ -IMAGE ckan-datapusher_0.0.16-200313 -FROM alpine3.10-python2.7_2.7.16-200313 +IMAGE ckan-datapusher_0.0.16-200403 +FROM alpine3.10-python2.7_2.7.16-200403 # Alpine 3.11 discontinued uwsgi-python2 module RUN EOF diff --git a/lxc-apps/ckan/ckan.image b/lxc-apps/ckan/ckan.image index dbe2db1..8093d4b 100644 --- a/lxc-apps/ckan/ckan.image +++ b/lxc-apps/ckan/ckan.image @@ -1,5 +1,5 @@ -IMAGE ckan_2.8.3-200313 -FROM alpine3.11-python2.7_2.7.16-200313 +IMAGE ckan_2.8.3-200403 +FROM alpine3.11-python2.7_2.7.16-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/ckan/install.sh b/lxc-apps/ckan/install.sh index a4dbc1e..85a8226 100755 --- a/lxc-apps/ckan/install.sh +++ b/lxc-apps/ckan/install.sh @@ -6,7 +6,7 @@ POSTGRES_DATA="${VOLUMES_DIR}/ckan/postgres_data" REDIS_CONF="${VOLUMES_DIR}/ckan/redis_conf" REDIS_DATA="${VOLUMES_DIR}/ckan/redis_data" SOLR_DATA="${VOLUMES_DIR}/ckan/solr_data" -SOLR_LAYER="${LAYERS_DIR}/solr6_6.5.1-200313" +SOLR_LAYER="${LAYERS_DIR}/solr6_6.5.1-200403" DATAPUSHER_CONF="${VOLUMES_DIR}/ckan/datapusher_conf" DATAPUSHER_DATA="${VOLUMES_DIR}/ckan/datapusher_data" CKAN_CONF="${VOLUMES_DIR}/ckan/ckan_conf" diff --git a/lxc-apps/crisiscleanup/app b/lxc-apps/crisiscleanup/app index fca8910..f6eab0d 100644 --- a/lxc-apps/crisiscleanup/app +++ b/lxc-apps/crisiscleanup/app @@ -1,5 +1,5 @@ { - "version": "2.2.0-200313", + "version": "2.2.0-200403", "meta": { "title": "Crisis Cleanup", "desc-cs": "Mapování následků katastrof", @@ -8,7 +8,7 @@ }, "containers": { "crisiscleanup": { - "image": "crisiscleanup_2.2.0-200313", + "image": "crisiscleanup_2.2.0-200403", "depends": [ "crisiscleanup-postgres" ], @@ -17,7 +17,7 @@ } }, "crisiscleanup-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "crisiscleanup/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/crisiscleanup/image b/lxc-apps/crisiscleanup/image index 978230d..76bd3a7 100644 --- a/lxc-apps/crisiscleanup/image +++ b/lxc-apps/crisiscleanup/image @@ -1,5 +1,5 @@ -IMAGE crisiscleanup_2.2.0-200313 -FROM alpine3.8-ruby2.4_2.4.9-200313 +IMAGE crisiscleanup_2.2.0-200403 +FROM alpine3.8-ruby2.4_2.4.9-200403 # yarn dependencies installation fails on nodejs>8 ENV RAILS_ENV production diff --git a/lxc-apps/crisiscleanup/install.sh b/lxc-apps/crisiscleanup/install.sh index 8b08a2c..1b826fc 100755 --- a/lxc-apps/crisiscleanup/install.sh +++ b/lxc-apps/crisiscleanup/install.sh @@ -4,7 +4,7 @@ set -ev # Volumes POSTGRES_DATA="${VOLUMES_DIR}/crisiscleanup/postgres_data" CC_CONF="${VOLUMES_DIR}/crisiscleanup/cc_conf" -CC_LAYER="${LAYERS_DIR}/crisiscleanup_2.2.0-200313" +CC_LAYER="${LAYERS_DIR}/crisiscleanup_2.2.0-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/cts/app b/lxc-apps/cts/app index 8bece70..1f26d47 100644 --- a/lxc-apps/cts/app +++ b/lxc-apps/cts/app @@ -1,5 +1,5 @@ { - "version": "0.8.0-200313", + "version": "0.8.0-200403", "meta": { "title": "CTS", "desc-cs": "Sledovací systém komodit", @@ -8,7 +8,7 @@ }, "containers": { "cts": { - "image": "cts_0.8.0-200313", + "image": "cts_0.8.0-200403", "depends": [ "cts-postgres" ], @@ -17,7 +17,7 @@ } }, "cts-postgres": { - "image": "postgis_3.0.0-200313", + "image": "postgis_3.0.0-200403", "mounts": { "cts/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/cts/image b/lxc-apps/cts/image index e49faa0..1114f84 100644 --- a/lxc-apps/cts/image +++ b/lxc-apps/cts/image @@ -1,5 +1,5 @@ -IMAGE cts_0.8.0-200313 -FROM alpine3.11-python2.7_2.7.16-200313 +IMAGE cts_0.8.0-200403 +FROM alpine3.11-python2.7_2.7.16-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh index 8525a91..91a8549 100755 --- a/lxc-apps/cts/install.sh +++ b/lxc-apps/cts/install.sh @@ -4,7 +4,7 @@ set -ev # Volumes POSTGRES_DATA="${VOLUMES_DIR}/cts/postgres_data" CTS_CONF="${VOLUMES_DIR}/cts/cts_conf" -CTS_LAYER="${LAYERS_DIR}/cts_0.8.0-200313" +CTS_LAYER="${LAYERS_DIR}/cts_0.8.0-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/decidim/app b/lxc-apps/decidim/app index 17af502..d460d14 100644 --- a/lxc-apps/decidim/app +++ b/lxc-apps/decidim/app @@ -1,5 +1,5 @@ { - "version": "0.20.0-200313", + "version": "0.20.1-200403", "meta": { "title": "Decidim", "desc-cs": "Platforma pro účast občanů", @@ -8,7 +8,7 @@ }, "containers": { "decidim": { - "image": "decidim_0.20.0-200313", + "image": "decidim_0.20.1-200403", "depends": [ "decidim-postgres" ], @@ -19,7 +19,7 @@ } }, "decidim-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "decidim/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/decidim/image b/lxc-apps/decidim/image index 388c984..ffbb200 100644 --- a/lxc-apps/decidim/image +++ b/lxc-apps/decidim/image @@ -1,5 +1,5 @@ -IMAGE decidim_0.20.0-200313 -FROM alpine3.11-ruby2.6_2.6.5-200313 +IMAGE decidim_0.20.1-200403 +FROM alpine3.11-ruby2.6_2.6.5-200403 # https://github.com/Platoniq/decidim-install/blob/master/decidim-bionic.md # https://github.com/Platoniq/decidim-install/blob/master/basic-config.md @@ -61,7 +61,7 @@ COPY image.d RUN EOF # Install gems required by decidim cd /srv/decidim-app - bundle install + bundle update # Setup delayed job for mail sending bin/rails generate delayed_job:active_record diff --git a/lxc-apps/decidim/image.d/srv/decidim-app/Gemfile b/lxc-apps/decidim/image.d/srv/decidim-app/Gemfile index 911bec8..9b40263 100644 --- a/lxc-apps/decidim/image.d/srv/decidim-app/Gemfile +++ b/lxc-apps/decidim/image.d/srv/decidim-app/Gemfile @@ -4,9 +4,9 @@ source "https://rubygems.org" ruby RUBY_VERSION -gem "decidim", "0.20.0" -# gem "decidim-consultations", "0.20.0" -# gem "decidim-initiatives", "0.20.0" +gem "decidim", "0.20.1" +# gem "decidim-consultations", "0.20.1" +# gem "decidim-initiatives", "0.20.1" gem "bootsnap", "~> 1.3" @@ -18,7 +18,7 @@ gem "faker", "~> 1.9" group :development, :test do gem "byebug", "~> 11.0", platform: :mri - gem "decidim-dev", "0.20.0" + gem "decidim-dev", "0.20.1" end group :development do diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh index 3eec914..36e3c48 100755 --- a/lxc-apps/decidim/install.sh +++ b/lxc-apps/decidim/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/decidim/postgres_data" DECIDIM_CONF="${VOLUMES_DIR}/decidim/decidim_conf" DECIDIM_DATA="${VOLUMES_DIR}/decidim/decidim_data" -DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.20.0-200313" +DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.20.1-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/ecogis/app b/lxc-apps/ecogis/app index 1093df1..e52e753 100644 --- a/lxc-apps/ecogis/app +++ b/lxc-apps/ecogis/app @@ -1,5 +1,5 @@ { - "version": "2.10.1-200313", + "version": "2.10.1-200403", "meta": { "title": "EcoGIS", "desc-cs": "EcoGIS", @@ -8,7 +8,7 @@ }, "containers": { "ecogis": { - "image": "ecogis_2.10.1-200313", + "image": "ecogis_2.10.1-200403", "depends": [ "ecogis-postgres" ], diff --git a/lxc-apps/ecogis/image b/lxc-apps/ecogis/image index eef6655..3351987 100644 --- a/lxc-apps/ecogis/image +++ b/lxc-apps/ecogis/image @@ -1,5 +1,5 @@ -IMAGE ecogis_2.10.1-200313 -FROM alpine3.8-php5.6_5.6.40-200313 +IMAGE ecogis_2.10.1-200403 +FROM alpine3.8-php5.6_5.6.40-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/frontlinesms/app b/lxc-apps/frontlinesms/app index b9c4020..529cf41 100644 --- a/lxc-apps/frontlinesms/app +++ b/lxc-apps/frontlinesms/app @@ -1,5 +1,5 @@ { - "version": "2.6.5-200313", + "version": "2.6.5-200403", "meta": { "title": "FrontlineSMS", "desc-cs": "Hromadné odesílání zpráv", @@ -8,7 +8,7 @@ }, "containers": { "frontlinesms": { - "image": "frontlinesms_2.6.5-200313", + "image": "frontlinesms_2.6.5-200403", "mounts": { "frontlinesms/flsms_data": "/srv/frontlinesms/.frontlinesms2" } diff --git a/lxc-apps/frontlinesms/image b/lxc-apps/frontlinesms/image index ba442dd..7257650 100644 --- a/lxc-apps/frontlinesms/image +++ b/lxc-apps/frontlinesms/image @@ -1,5 +1,5 @@ -IMAGE frontlinesms_2.6.5-200313 -FROM alpine3.8-java8_8.222.10-200313 +IMAGE frontlinesms_2.6.5-200403 +FROM alpine3.8-java8_8.222.10-200403 # HTTP connection accept fails on Java 8.242 RUN EOF diff --git a/lxc-apps/gnuhealth/app b/lxc-apps/gnuhealth/app index 9867f38..9bce532 100644 --- a/lxc-apps/gnuhealth/app +++ b/lxc-apps/gnuhealth/app @@ -1,5 +1,5 @@ { - "version": "3.6.3-200313", + "version": "3.6.3-200403", "meta": { "title": "GNU Health", "desc-cs": "Lékařské záznamy pacientů", @@ -8,7 +8,7 @@ }, "containers": { "gnuhealth": { - "image": "gnuhealth_3.6.3-200313", + "image": "gnuhealth_3.6.3-200403", "depends": [ "gnuhealth-postgres" ], @@ -17,7 +17,7 @@ } }, "gnuhealth-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "gnuhealth/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/gnuhealth/image b/lxc-apps/gnuhealth/image index 68ee947..9afdb2f 100644 --- a/lxc-apps/gnuhealth/image +++ b/lxc-apps/gnuhealth/image @@ -1,5 +1,5 @@ -IMAGE gnuhealth_3.6.3-200313 -FROM alpine3.11-python3.8_3.8.2-200313 +IMAGE gnuhealth_3.6.3-200403 +FROM alpine3.11-python3.8_3.8.2-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/kanboard/app b/lxc-apps/kanboard/app index 3645b30..710863e 100644 --- a/lxc-apps/kanboard/app +++ b/lxc-apps/kanboard/app @@ -1,5 +1,5 @@ { - "version": "1.2.13-200313", + "version": "1.2.13-200403", "meta": { "title": "KanBoard", "desc-cs": "Kanban řízení projektů", @@ -8,7 +8,7 @@ }, "containers": { "kanboard": { - "image": "kanboard_1.2.13-200313", + "image": "kanboard_1.2.13-200403", "depends": [ "kanboard-postgres" ], @@ -18,7 +18,7 @@ } }, "kanboard-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "kanboard/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/kanboard/image b/lxc-apps/kanboard/image index 1b2927e..d99213c 100644 --- a/lxc-apps/kanboard/image +++ b/lxc-apps/kanboard/image @@ -1,5 +1,5 @@ -IMAGE kanboard_1.2.13-200313 -FROM alpine3.11-php7.3_7.3.15-200313 +IMAGE kanboard_1.2.13-200403 +FROM alpine3.11-php7.3_7.3.16-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/mifosx/app b/lxc-apps/mifosx/app index f253c37..7f014e4 100644 --- a/lxc-apps/mifosx/app +++ b/lxc-apps/mifosx/app @@ -1,5 +1,5 @@ { - "version": "18.03.01-200313", + "version": "18.03.01-200403", "meta": { "title": "Mifos X", "desc-cs": "Mikrofinancování rozvojových projektů", @@ -8,7 +8,7 @@ }, "containers": { "mifosx": { - "image": "mifosx_18.03.01-200313", + "image": "mifosx_18.03.01-200403", "depends": [ "mifosx-mariadb" ], @@ -18,7 +18,7 @@ } }, "mifosx-mariadb": { - "image": "mariadb_10.4.12-200313", + "image": "mariadb_10.4.12-200403", "mounts": { "mifosx/mariadb_conf/my.cnf": "etc/my.cnf:file", "mifosx/mariadb_data": "var/lib/mysql" diff --git a/lxc-apps/mifosx/image b/lxc-apps/mifosx/image index 9ccd7fc..012901a 100644 --- a/lxc-apps/mifosx/image +++ b/lxc-apps/mifosx/image @@ -1,5 +1,5 @@ -IMAGE mifosx_18.03.01-200313 -FROM alpine3.11-tomcat8.5_8.5.51-200313 +IMAGE mifosx_18.03.01-200403 +FROM alpine3.11-tomcat8.5_8.5.53-200403 RUN EOF # Install full-featured wget to work around sourceforge bugs diff --git a/lxc-apps/motech/app b/lxc-apps/motech/app index 24009cc..a0afc6f 100644 --- a/lxc-apps/motech/app +++ b/lxc-apps/motech/app @@ -1,5 +1,5 @@ { - "version": "1.3.0-200313", + "version": "1.3.0-200403", "meta": { "title": "Motech", "desc-cs": "Automatizace komunikace", @@ -8,7 +8,7 @@ }, "containers": { "motech": { - "image": "motech_1.3.0-200313", + "image": "motech_1.3.0-200403", "depends": [ "motech-activemq", "motech-postgres" @@ -18,14 +18,14 @@ } }, "motech-activemq": { - "image": "activemq_5.15.9-200313", + "image": "activemq_5.15.9-200403", "mounts": { "motech/activemq_conf/activemq.xml": "srv/activemq/conf/activemq.xml:file", "motech/activemq_data": "srv/activemq/data" } }, "motech-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "motech/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/motech/image b/lxc-apps/motech/image index 4cfdd0b..af7f12a 100644 --- a/lxc-apps/motech/image +++ b/lxc-apps/motech/image @@ -1,5 +1,5 @@ -IMAGE motech_1.3.0-200313 -FROM alpine3.11-tomcat7_7.0.99-200313 +IMAGE motech_1.3.0-200403 +FROM alpine3.11-tomcat7_7.0.103-200403 RUN EOF # Download Motech diff --git a/lxc-apps/odoo/app b/lxc-apps/odoo/app index 7151fab..37a08ce 100644 --- a/lxc-apps/odoo/app +++ b/lxc-apps/odoo/app @@ -1,5 +1,5 @@ { - "version": "13.0.0-200313", + "version": "13.0.0-200403", "meta": { "title": "Odoo", "desc-cs": "Sada aplikací pro správu organizace", @@ -8,7 +8,7 @@ }, "containers": { "odoo": { - "image": "odoo_13.0.0-200313", + "image": "odoo_13.0.0-200403", "depends": [ "odoo-postgres" ], @@ -18,7 +18,7 @@ } }, "odoo-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "odoo/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/odoo/image b/lxc-apps/odoo/image index e70a6d6..495d61b 100644 --- a/lxc-apps/odoo/image +++ b/lxc-apps/odoo/image @@ -1,5 +1,5 @@ -IMAGE odoo_13.0.0-200313 -FROM alpine3.11-python3.8_3.8.2-200313 +IMAGE odoo_13.0.0-200403 +FROM alpine3.11-python3.8_3.8.2-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/opendatakit/app b/lxc-apps/opendatakit/app index 0d9e6c1..61cff8d 100644 --- a/lxc-apps/opendatakit/app +++ b/lxc-apps/opendatakit/app @@ -1,5 +1,5 @@ { - "version": "2.0.5-200313", + "version": "2.0.5-200403", "meta": { "title": "OpenDataKit", "desc-cs": "Sběr formulářových dat", @@ -8,7 +8,7 @@ }, "containers": { "opendatakit": { - "image": "opendatakit_2.0.5-200313", + "image": "opendatakit_2.0.5-200403", "depends": [ "opendatakit-postgres" ], @@ -19,7 +19,7 @@ } }, "opendatakit-build": { - "image": "opendatakit-build_0.3.5-200313", + "image": "opendatakit-build_0.3.5-200403", "depends": [ "opendatakit-postgres" ], @@ -28,7 +28,7 @@ } }, "opendatakit-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "opendatakit/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/opendatakit/opendatakit-build.image b/lxc-apps/opendatakit/opendatakit-build.image index c90fa98..9fcc969 100644 --- a/lxc-apps/opendatakit/opendatakit-build.image +++ b/lxc-apps/opendatakit/opendatakit-build.image @@ -1,5 +1,5 @@ -IMAGE opendatakit-build_0.3.5-200313 -FROM alpine3.11-ruby2.4_2.4.9-200313 +IMAGE opendatakit-build_0.3.5-200403 +FROM alpine3.11-ruby2.4_2.4.9-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/opendatakit/opendatakit.image b/lxc-apps/opendatakit/opendatakit.image index 3cbbf1c..2e53755 100644 --- a/lxc-apps/opendatakit/opendatakit.image +++ b/lxc-apps/opendatakit/opendatakit.image @@ -1,5 +1,5 @@ -IMAGE opendatakit_2.0.5-200313 -FROM alpine3.11-tomcat8.5_8.5.51-200313 +IMAGE opendatakit_2.0.5-200403 +FROM alpine3.11-tomcat8.5_8.5.53-200403 RUN EOF # Download OpenDataKit diff --git a/lxc-apps/openmapkit/app b/lxc-apps/openmapkit/app index 4c79b9a..6a0f736 100644 --- a/lxc-apps/openmapkit/app +++ b/lxc-apps/openmapkit/app @@ -1,5 +1,5 @@ { - "version": "0.12.0-200313", + "version": "0.12.0-200403", "meta": { "title": "OpenMapKit", "desc-cs": "Sběr mapových dat", @@ -8,7 +8,7 @@ }, "containers": { "openmapkit": { - "image": "openmapkit_0.12.0-200313", + "image": "openmapkit_0.12.0-200403", "mounts": { "openmapkit/omk_conf/settings.js": "srv/openmapkit/settings.js:file", "openmapkit/omk_data": "srv/openmapkit/data" diff --git a/lxc-apps/openmapkit/image b/lxc-apps/openmapkit/image index 6d7830a..ea03224 100644 --- a/lxc-apps/openmapkit/image +++ b/lxc-apps/openmapkit/image @@ -1,5 +1,5 @@ -IMAGE openmapkit_0.12.0-200313 -FROM alpine3.10-nodejs10_10.19.0-200313 +IMAGE openmapkit_0.12.0-200403 +FROM alpine3.10-nodejs10_10.19.0-200403 # libxmljs installation fails on nodejs>10 RUN EOF diff --git a/lxc-apps/openmapkit/install.sh b/lxc-apps/openmapkit/install.sh index 67a807a..27eb3ea 100755 --- a/lxc-apps/openmapkit/install.sh +++ b/lxc-apps/openmapkit/install.sh @@ -4,7 +4,7 @@ set -ev # Volumes OMK_CONF="${VOLUMES_DIR}/openmapkit/omk_conf" OMK_DATA="${VOLUMES_DIR}/openmapkit/omk_data" -OMK_LAYER="${LAYERS_DIR}/openmapkit_0.12.0-200313" +OMK_LAYER="${LAYERS_DIR}/openmapkit_0.12.0-200403" # Configure OpenMapKit export OPENMAPKIT_ADMIN_USER="admin" diff --git a/lxc-apps/pandora/app b/lxc-apps/pandora/app index e06ca8a..161987d 100644 --- a/lxc-apps/pandora/app +++ b/lxc-apps/pandora/app @@ -1,5 +1,5 @@ { - "version": "0.0.1-200313", + "version": "0.0.1-200403", "meta": { "title": "Pan.do/ra", "desc-cs": "Archiv medií", @@ -8,7 +8,7 @@ }, "containers": { "pandora": { - "image": "pandora_0.0.1-200313", + "image": "pandora_0.0.1-200403", "depends": [ "pandora-postgres", "pandora-rabbitmq" @@ -19,13 +19,13 @@ } }, "pandora-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "pandora/postgres_data": "var/lib/postgresql" } }, "pandora-rabbitmq": { - "image": "rabbitmq_3.7.18-200313", + "image": "rabbitmq_3.7.18-200403", "mounts": { "pandora/rabbitmq_data": "var/lib/rabbitmq/mnesia" } diff --git a/lxc-apps/pandora/image b/lxc-apps/pandora/image index 5808242..c714b9c 100644 --- a/lxc-apps/pandora/image +++ b/lxc-apps/pandora/image @@ -1,5 +1,5 @@ -IMAGE pandora_0.0.1-200313 -FROM alpine3.10-python3.7_3.7.5-200313 +IMAGE pandora_0.0.1-200403 +FROM alpine3.10-python3.7_3.7.5-200403 # Django required by Pandora requires psycopg<=2.7.7 which does not compile under python3.8 RUN EOF diff --git a/lxc-apps/sahana-demo/app b/lxc-apps/sahana-demo/app index 7250d33..8ff48f8 100644 --- a/lxc-apps/sahana-demo/app +++ b/lxc-apps/sahana-demo/app @@ -1,5 +1,5 @@ { - "version": "0.0.1-200313", + "version": "0.0.1-200403", "meta": { "title": "Sahana Eden - Demo", "desc-cs": "Řízení humanítární činnosti - Demo instance", @@ -8,7 +8,7 @@ }, "containers": { "sahana-demo": { - "image": "sahana_0.0.1-200313", + "image": "sahana_0.0.1-200403", "depends": [ "sahana-demo-postgres" ], @@ -20,7 +20,7 @@ } }, "sahana-demo-postgres": { - "image": "postgis_3.0.0-200313", + "image": "postgis_3.0.0-200403", "mounts": { "sahana-demo/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/sahana-demo/install.sh b/lxc-apps/sahana-demo/install.sh index 0b4ab42..c63ec0b 100755 --- a/lxc-apps/sahana-demo/install.sh +++ b/lxc-apps/sahana-demo/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/sahana-demo/postgres_data" SAHANA_DATA="${VOLUMES_DIR}/sahana-demo/sahana_data" SAHANA_CONF="${VOLUMES_DIR}/sahana-demo/sahana_conf" -SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200313" +SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/sahana/app b/lxc-apps/sahana/app index 300cefa..de7d1be 100644 --- a/lxc-apps/sahana/app +++ b/lxc-apps/sahana/app @@ -1,5 +1,5 @@ { - "version": "0.0.1-200313", + "version": "0.0.1-200403", "meta": { "title": "Sahana Eden", "desc-cs": "Řízení humanítární činnosti", @@ -8,7 +8,7 @@ }, "containers": { "sahana": { - "image": "sahana_0.0.1-200313", + "image": "sahana_0.0.1-200403", "depends": [ "sahana-postgres" ], @@ -20,7 +20,7 @@ } }, "sahana-postgres": { - "image": "postgis_3.0.0-200313", + "image": "postgis_3.0.0-200403", "mounts": { "sahana/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/sahana/image b/lxc-apps/sahana/image index 3a2e292..9c631ef 100644 --- a/lxc-apps/sahana/image +++ b/lxc-apps/sahana/image @@ -1,5 +1,5 @@ -IMAGE sahana_0.0.1-200313 -FROM alpine3.11-python3.8_3.8.2-200313 +IMAGE sahana_0.0.1-200403 +FROM alpine3.11-python3.8_3.8.2-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/sahana/install.sh b/lxc-apps/sahana/install.sh index c8880b4..117fbde 100755 --- a/lxc-apps/sahana/install.sh +++ b/lxc-apps/sahana/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/sahana/postgres_data" SAHANA_DATA="${VOLUMES_DIR}/sahana/sahana_data" SAHANA_CONF="${VOLUMES_DIR}/sahana/sahana_conf" -SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200313" +SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/sambro/app b/lxc-apps/sambro/app index 0b29941..220bc12 100644 --- a/lxc-apps/sambro/app +++ b/lxc-apps/sambro/app @@ -1,5 +1,5 @@ { - "version": "0.0.1-200313", + "version": "0.0.1-200403", "meta": { "title": "Sahana Eden - SAMBRO", "desc-cs": "Řízení humanítární činnosti - Centrum hlášení a výstrah", @@ -8,7 +8,7 @@ }, "containers": { "sambro": { - "image": "sahana_0.0.1-200313", + "image": "sahana_0.0.1-200403", "depends": [ "sambro-postgres" ], @@ -21,7 +21,7 @@ } }, "sambro-postgres": { - "image": "postgis_3.0.0-200313", + "image": "postgis_3.0.0-200403", "mounts": { "sambro/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/sambro/install.sh b/lxc-apps/sambro/install.sh index c2c17c0..e2be46b 100755 --- a/lxc-apps/sambro/install.sh +++ b/lxc-apps/sambro/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/sambro/postgres_data" SAHANA_DATA="${VOLUMES_DIR}/sambro/sahana_data" SAHANA_CONF="${VOLUMES_DIR}/sambro/sahana_conf" -SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200313" +SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/seeddms/app b/lxc-apps/seeddms/app index 901635c..464a02a 100644 --- a/lxc-apps/seeddms/app +++ b/lxc-apps/seeddms/app @@ -1,5 +1,5 @@ { - "version": "5.1.15-200313", + "version": "5.1.15-200403", "meta": { "title": "SeedDMS", "desc-cs": "Archiv dokumentace", @@ -8,7 +8,7 @@ }, "containers": { "seeddms": { - "image": "seeddms_5.1.15-200313", + "image": "seeddms_5.1.15-200403", "depends": [ "seeddms-postgres" ], @@ -18,7 +18,7 @@ } }, "seeddms-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "seeddms/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/seeddms/image b/lxc-apps/seeddms/image index 75e6629..f4b16ea 100644 --- a/lxc-apps/seeddms/image +++ b/lxc-apps/seeddms/image @@ -1,5 +1,5 @@ -IMAGE seeddms_5.1.15-200313 -FROM alpine3.11-php7.3_7.3.15-200313 +IMAGE seeddms_5.1.15-200403 +FROM alpine3.11-php7.3_7.3.16-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-apps/seeddms/install.sh b/lxc-apps/seeddms/install.sh index 08f2a7a..d12010b 100755 --- a/lxc-apps/seeddms/install.sh +++ b/lxc-apps/seeddms/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/seeddms/postgres_data" SEEDDMS_DATA="${VOLUMES_DIR}/seeddms/seeddms_data" SEEDDMS_CONF="${VOLUMES_DIR}/seeddms/seeddms_conf" -SEEDDMS_LAYER="${LAYERS_DIR}/seeddms_5.1.15-200313" +SEEDDMS_LAYER="${LAYERS_DIR}/seeddms_5.1.15-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/sigmah/app b/lxc-apps/sigmah/app index 40b20f5..7408c18 100644 --- a/lxc-apps/sigmah/app +++ b/lxc-apps/sigmah/app @@ -1,5 +1,5 @@ { - "version": "2.0.2-200313", + "version": "2.0.2-200403", "meta": { "title": "Sigmah", "desc-cs": "Finanční řízení sbírek", @@ -8,7 +8,7 @@ }, "containers": { "sigmah": { - "image": "sigmah_2.0.2-200313", + "image": "sigmah_2.0.2-200403", "depends": [ "sigmah-postgres" ], @@ -19,7 +19,7 @@ } }, "sigmah-postgres": { - "image": "postgres_12.2.0-200313", + "image": "postgres_12.2.0-200403", "mounts": { "sigmah/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/sigmah/image b/lxc-apps/sigmah/image index 99e0c97..73422e3 100644 --- a/lxc-apps/sigmah/image +++ b/lxc-apps/sigmah/image @@ -1,5 +1,5 @@ -IMAGE sigmah_2.0.2-200313 -FROM alpine3.11-tomcat8.5_8.5.51-200313 +IMAGE sigmah_2.0.2-200403 +FROM alpine3.11-tomcat8.5_8.5.53-200403 RUN EOF # Download Sigmah diff --git a/lxc-apps/sigmah/install.sh b/lxc-apps/sigmah/install.sh index e555758..561d8a3 100755 --- a/lxc-apps/sigmah/install.sh +++ b/lxc-apps/sigmah/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/sigmah/postgres_data" SIGMAH_DATA="${VOLUMES_DIR}/sigmah/sigmah_data" SIGMAH_CONF="${VOLUMES_DIR}/sigmah/sigmah_conf" -SIGMAH_LAYER="${LAYERS_DIR}/sigmah_2.0.2-200313" +SIGMAH_LAYER="${LAYERS_DIR}/sigmah_2.0.2-200403" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/ushahidi/app b/lxc-apps/ushahidi/app index 8ff6cd5..203010a 100644 --- a/lxc-apps/ushahidi/app +++ b/lxc-apps/ushahidi/app @@ -1,5 +1,5 @@ { - "version": "4.4.1-200313", + "version": "4.4.1-200403", "meta": { "title": "Ushahidi", "desc-cs": "Skupinová reakce na události", @@ -8,7 +8,7 @@ }, "containers": { "ushahidi": { - "image": "ushahidi_4.4.1-200313", + "image": "ushahidi_4.4.1-200403", "depends": [ "ushahidi-redis", "ushahidi-mariadb" @@ -20,14 +20,14 @@ } }, "ushahidi-redis": { - "image": "redis_5.0.7-200313", + "image": "redis_5.0.7-200403", "mounts": { "ushahidi/redis_conf/redis.conf": "etc/redis.conf:file", "ushahidi/redis_data": "var/lib/redis" } }, "ushahidi-mariadb": { - "image": "mariadb_10.4.12-200313", + "image": "mariadb_10.4.12-200403", "mounts": { "ushahidi/mariadb_conf/my.cnf": "etc/my.cnf:file", "ushahidi/mariadb_data": "var/lib/mysql" diff --git a/lxc-apps/ushahidi/image b/lxc-apps/ushahidi/image index 268ad0b..b3a5b84 100644 --- a/lxc-apps/ushahidi/image +++ b/lxc-apps/ushahidi/image @@ -1,12 +1,12 @@ -IMAGE ushahidi_4.4.1-200313 -FROM alpine3.11-php7.3_7.3.15-200313 +IMAGE ushahidi_4.4.2-200403 +FROM alpine3.11-php7.3_7.3.16-200403 RUN EOF # Install runtime dependencies apk --no-cache add php7-curl php7-imap php7-mysqli php7-pecl-memcached php7-pecl-redis php7-pdo_mysql # Download Ushahidi - wget https://github.com/ushahidi/platform-client/releases/download/v4.4.1/ushahidi-platform-client-bundle-v4.4.1.tar.gz -O - | tar xzf - -C /srv + wget https://github.com/ushahidi/platform-client/releases/download/v4.4.2/ushahidi-platform-client-bundle-v4.4.2.tar.gz -O - | tar xzf - -C /srv mv /srv/ushahidi-platform-client-bundle-* /srv/ushahidi wget https://github.com/ushahidi/platform/releases/download/v4.4.1/ushahidi-platform-bundle-v4.4.1.tar.gz -O - | tar xzf - -C /srv/ushahidi mv /srv/ushahidi/ushahidi-platform-bundle-* /srv/ushahidi/platform diff --git a/lxc-services/activemq/image b/lxc-services/activemq/image index d94011e..9ebdb31 100644 --- a/lxc-services/activemq/image +++ b/lxc-services/activemq/image @@ -1,5 +1,5 @@ -IMAGE activemq_5.15.9-200313 -FROM alpine3.11-java8_8.242.08-200313 +IMAGE activemq_5.15.9-200403 +FROM alpine3.11-java8_8.242.08-200403 RUN EOF # Download and install ActiveMQ diff --git a/lxc-services/mariadb/image b/lxc-services/mariadb/image index a3ac9b3..0c85306 100644 --- a/lxc-services/mariadb/image +++ b/lxc-services/mariadb/image @@ -1,5 +1,5 @@ -IMAGE mariadb_10.4.12-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE mariadb_10.4.12-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/postgis/image b/lxc-services/postgis/image index ec02203..0ab2e1a 100644 --- a/lxc-services/postgis/image +++ b/lxc-services/postgis/image @@ -1,5 +1,5 @@ -IMAGE postgis_3.0.0-200313 -FROM postgres_12.2.0-200313 +IMAGE postgis_3.0.0-200403 +FROM postgres_12.2.0-200403 USER root diff --git a/lxc-services/postgres/image b/lxc-services/postgres/image index cb7d760..b642d0e 100644 --- a/lxc-services/postgres/image +++ b/lxc-services/postgres/image @@ -1,5 +1,5 @@ -IMAGE postgres_12.2.0-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE postgres_12.2.0-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/rabbitmq/image b/lxc-services/rabbitmq/image index 98cea79..1f73b7e 100644 --- a/lxc-services/rabbitmq/image +++ b/lxc-services/rabbitmq/image @@ -1,5 +1,5 @@ -IMAGE rabbitmq_3.7.18-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE rabbitmq_3.7.18-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/redis/image b/lxc-services/redis/image index 16e2d71..219f173 100644 --- a/lxc-services/redis/image +++ b/lxc-services/redis/image @@ -1,5 +1,5 @@ -IMAGE redis_5.0.7-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE redis_5.0.7-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF # Create OS user (which will be picked up later by apk add) diff --git a/lxc-services/solr6/image b/lxc-services/solr6/image index b4041af..8d86dfd 100644 --- a/lxc-services/solr6/image +++ b/lxc-services/solr6/image @@ -1,5 +1,5 @@ -IMAGE solr6_6.5.1-200313 -FROM alpine3.11-java8_8.242.08-200313 +IMAGE solr6_6.5.1-200403 +FROM alpine3.11-java8_8.242.08-200403 RUN EOF # Install runtime dependencies diff --git a/lxc-shared/alpine3.10-nodejs10/image b/lxc-shared/alpine3.10-nodejs10/image index 483ab63..6d8ea5d 100644 --- a/lxc-shared/alpine3.10-nodejs10/image +++ b/lxc-shared/alpine3.10-nodejs10/image @@ -1,5 +1,5 @@ -IMAGE alpine3.10-nodejs10_10.19.0-200313 -FROM alpine3.10_3.10.4-200313 +IMAGE alpine3.10-nodejs10_10.19.0-200403 +FROM alpine3.10_3.10.4-200403 RUN EOF apk --no-cache add nodejs diff --git a/lxc-shared/alpine3.10-python2.7/image b/lxc-shared/alpine3.10-python2.7/image index db7dbe5..bd64e68 100644 --- a/lxc-shared/alpine3.10-python2.7/image +++ b/lxc-shared/alpine3.10-python2.7/image @@ -1,5 +1,5 @@ -IMAGE alpine3.10-python2.7_2.7.16-200313 -FROM alpine3.10_3.10.4-200313 +IMAGE alpine3.10-python2.7_2.7.16-200403 +FROM alpine3.10_3.10.4-200403 RUN EOF apk --no-cache add python2 diff --git a/lxc-shared/alpine3.10-python3.7/image b/lxc-shared/alpine3.10-python3.7/image index 2b5fdb7..fad218c 100644 --- a/lxc-shared/alpine3.10-python3.7/image +++ b/lxc-shared/alpine3.10-python3.7/image @@ -1,5 +1,5 @@ -IMAGE alpine3.10-python3.7_3.7.5-200313 -FROM alpine3.10_3.10.4-200313 +IMAGE alpine3.10-python3.7_3.7.5-200403 +FROM alpine3.10_3.10.4-200403 RUN EOF apk --no-cache add python3 diff --git a/lxc-shared/alpine3.10/image b/lxc-shared/alpine3.10/image index 37f2868..f9d830f 100644 --- a/lxc-shared/alpine3.10/image +++ b/lxc-shared/alpine3.10/image @@ -1,4 +1,4 @@ -IMAGE alpine3.10_3.10.4-200313 +IMAGE alpine3.10_3.10.4-200403 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.10/x86_64/alpine-minirootfs-3.10.4-x86_64.tar.gz diff --git a/lxc-shared/alpine3.11-java8/image b/lxc-shared/alpine3.11-java8/image index 0aed130..9c14324 100644 --- a/lxc-shared/alpine3.11-java8/image +++ b/lxc-shared/alpine3.11-java8/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-java8_8.242.08-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE alpine3.11-java8_8.242.08-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF apk --no-cache add openjdk8-jre-base diff --git a/lxc-shared/alpine3.11-php7.3/image b/lxc-shared/alpine3.11-php7.3/image index d284d78..019a618 100644 --- a/lxc-shared/alpine3.11-php7.3/image +++ b/lxc-shared/alpine3.11-php7.3/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-php7.3_7.3.15-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE alpine3.11-php7.3_7.3.16-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session diff --git a/lxc-shared/alpine3.11-python2.7/image b/lxc-shared/alpine3.11-python2.7/image index c2b3cc9..b24aa16 100644 --- a/lxc-shared/alpine3.11-python2.7/image +++ b/lxc-shared/alpine3.11-python2.7/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-python2.7_2.7.16-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE alpine3.11-python2.7_2.7.16-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF apk --no-cache add python2 diff --git a/lxc-shared/alpine3.11-python3.8/image b/lxc-shared/alpine3.11-python3.8/image index b11448f..84c8e4d 100644 --- a/lxc-shared/alpine3.11-python3.8/image +++ b/lxc-shared/alpine3.11-python3.8/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-python3.8_3.8.2-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE alpine3.11-python3.8_3.8.2-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF apk --no-cache add python3 diff --git a/lxc-shared/alpine3.11-ruby2.4/image b/lxc-shared/alpine3.11-ruby2.4/image index ea8c8b5..ff50a65 100644 --- a/lxc-shared/alpine3.11-ruby2.4/image +++ b/lxc-shared/alpine3.11-ruby2.4/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-ruby2.4_2.4.9-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE alpine3.11-ruby2.4_2.4.9-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.11-ruby2.6/image b/lxc-shared/alpine3.11-ruby2.6/image index a57c629..589bdf7 100644 --- a/lxc-shared/alpine3.11-ruby2.6/image +++ b/lxc-shared/alpine3.11-ruby2.6/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-ruby2.6_2.6.5-200313 -FROM alpine3.11_3.11.3-200313 +IMAGE alpine3.11-ruby2.6_2.6.5-200403 +FROM alpine3.11_3.11.5-200403 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.11-tomcat7/image b/lxc-shared/alpine3.11-tomcat7/image index 8e41c39..580c71c 100644 --- a/lxc-shared/alpine3.11-tomcat7/image +++ b/lxc-shared/alpine3.11-tomcat7/image @@ -1,9 +1,9 @@ -IMAGE alpine3.11-tomcat7_7.0.99-200313 -FROM alpine3.11-java8_8.242.08-200313 +IMAGE alpine3.11-tomcat7_7.0.103-200403 +FROM alpine3.11-java8_8.242.08-200403 RUN EOF # Install Tomcat 7 - wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.99/bin/apache-tomcat-7.0.99.tar.gz -O - | tar xzf - -C /srv + wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz -O - | tar xzf - -C /srv mv /srv/apache-tomcat-* /srv/tomcat # Make catalina.sh available globally diff --git a/lxc-shared/alpine3.11-tomcat8.5/image b/lxc-shared/alpine3.11-tomcat8.5/image index 099c577..78a020d 100644 --- a/lxc-shared/alpine3.11-tomcat8.5/image +++ b/lxc-shared/alpine3.11-tomcat8.5/image @@ -1,9 +1,9 @@ -IMAGE alpine3.11-tomcat8.5_8.5.51-200313 -FROM alpine3.11-java8_8.242.08-200313 +IMAGE alpine3.11-tomcat8.5_8.5.53-200403 +FROM alpine3.11-java8_8.242.08-200403 RUN EOF # Install Tomcat 8.5 - wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz -O - | tar xzf - -C /srv + wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.53/bin/apache-tomcat-8.5.53.tar.gz -O - | tar xzf - -C /srv mv /srv/apache-tomcat-* /srv/tomcat # Make catalina.sh available globally diff --git a/lxc-shared/alpine3.11/image b/lxc-shared/alpine3.11/image index 19ddbc1..af06abb 100644 --- a/lxc-shared/alpine3.11/image +++ b/lxc-shared/alpine3.11/image @@ -1,6 +1,6 @@ -IMAGE alpine3.11_3.11.3-200313 +IMAGE alpine3.11_3.11.5-200403 -COPY https://github.com/alpinelinux/docker-alpine/raw/v3.11/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz +COPY https://github.com/alpinelinux/docker-alpine/raw/v3.11/x86_64/alpine-minirootfs-3.11.5-x86_64.tar.gz RUN EOF # Update packages diff --git a/lxc-shared/alpine3.8-java8/image b/lxc-shared/alpine3.8-java8/image index 24ce528..3b8e56d 100644 --- a/lxc-shared/alpine3.8-java8/image +++ b/lxc-shared/alpine3.8-java8/image @@ -1,5 +1,5 @@ -IMAGE alpine3.8-java8_8.222.10-200313 -FROM alpine3.8_3.8.5-200313 +IMAGE alpine3.8-java8_8.222.10-200403 +FROM alpine3.8_3.8.5-200403 RUN EOF apk --no-cache add openjdk8-jre-base diff --git a/lxc-shared/alpine3.8-php5.6/image b/lxc-shared/alpine3.8-php5.6/image index f384e83..7ec630b 100644 --- a/lxc-shared/alpine3.8-php5.6/image +++ b/lxc-shared/alpine3.8-php5.6/image @@ -1,5 +1,5 @@ -IMAGE alpine3.8-php5.6_5.6.40-200313 -FROM alpine3.8_3.8.5-200313 +IMAGE alpine3.8-php5.6_5.6.40-200403 +FROM alpine3.8_3.8.5-200403 RUN EOF apk --no-cache add nginx php5 php5-ctype php5-fpm php5-gd php5-json php5-mcrypt php5-opcache diff --git a/lxc-shared/alpine3.8-ruby2.4/image b/lxc-shared/alpine3.8-ruby2.4/image index 535b50f..a07eff2 100644 --- a/lxc-shared/alpine3.8-ruby2.4/image +++ b/lxc-shared/alpine3.8-ruby2.4/image @@ -1,5 +1,5 @@ -IMAGE alpine3.8-ruby2.4_2.4.9-200313 -FROM alpine3.8_3.8.5-200313 +IMAGE alpine3.8-ruby2.4_2.4.9-200403 +FROM alpine3.8_3.8.5-200403 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.8/image b/lxc-shared/alpine3.8/image index 06f7532..0fef842 100644 --- a/lxc-shared/alpine3.8/image +++ b/lxc-shared/alpine3.8/image @@ -1,4 +1,4 @@ -IMAGE alpine3.8_3.8.5-200313 +IMAGE alpine3.8_3.8.5-200403 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.8/x86_64/alpine-minirootfs-3.8.5-x86_64.tar.gz diff --git a/vm.sh b/vm.sh index e1a31a6..3c0c4aa 100755 --- a/vm.sh +++ b/vm.sh @@ -89,7 +89,7 @@ apk --no-cache add apache2-utils gettext wget https://repo.spotter.cz/vm.tar.gz -O - | tar xzf - -C /mnt envsubst /mnt/boot/extlinux.conf.new mv /mnt/boot/extlinux.conf.new /mnt/boot/extlinux.conf -chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc logrotate postfix nginx openssh-server openssh-sftp-server util-linux wireguard-virt wireguard-tools-wg lxc@vm spoc@vm vmmgr@vm +chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc logrotate postfix nginx openssh-server openssh-sftp-server util-linux lxc@vm spoc@vm vmmgr@vm chroot /mnt newaliases for SERVICE in cgroups consolefont crond iptables networking nginx ntpd postfix spoc swap urandom vmmgr; do ln -s /etc/init.d/${SERVICE} /mnt/etc/runlevels/boot