From 8bc038ea0254f68ad1010c87d0b956a2be7b7aef Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 22 Oct 2020 23:05:01 +0200 Subject: [PATCH] Bump Sahana to newer commit on Alpine 3.12 Bumped web2py to 2.20.4, python 3 now officially fully supported --- lxc-apps/safire/app | 6 +++--- lxc-apps/safire/install.sh | 2 +- lxc-apps/sahana-demo/app | 6 +++--- lxc-apps/sahana-demo/install.sh | 2 +- lxc-apps/sahana/app | 6 +++--- lxc-apps/sahana/image | 19 ++++++------------- lxc-apps/sahana/install.sh | 2 +- lxc-apps/sambro/app | 6 +++--- lxc-apps/sambro/install.sh | 2 +- lxc-apps/share/app | 6 +++--- lxc-apps/share/install.sh | 2 +- 11 files changed, 26 insertions(+), 33 deletions(-) diff --git a/lxc-apps/safire/app b/lxc-apps/safire/app index d4044f6..66cb024 100644 --- a/lxc-apps/safire/app +++ b/lxc-apps/safire/app @@ -1,5 +1,5 @@ { - "version": "1.0.3-200621", + "version": "1.0.3-201021", "meta": { "title": "Sahana Eden - SAFIRE", "desc-cs": "Řízení humanítární činnosti - Řešení nouzových událostí", @@ -8,7 +8,7 @@ }, "containers": { "safire": { - "image": "sahana_1.0.3-200621", + "image": "sahana_1.0.3-201021", "depends": [ "safire-postgres" ], @@ -23,7 +23,7 @@ } }, "safire-postgres": { - "image": "postgis_3.0.0-200621", + "image": "postgis_3.0.1-201021", "mounts": { "safire/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/safire/install.sh b/lxc-apps/safire/install.sh index 5da5bc7..bdaf7b7 100755 --- a/lxc-apps/safire/install.sh +++ b/lxc-apps/safire/install.sh @@ -5,7 +5,7 @@ set -ev POSTGRES_DATA="${VOLUMES_DIR}/safire/postgres_data" SAHANA_DATA="${VOLUMES_DIR}/safire/sahana_data" SAHANA_CONF="${VOLUMES_DIR}/safire/sahana_conf" -SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621" +SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-201021" # Create Postgres instance install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} diff --git a/lxc-apps/sahana-demo/app b/lxc-apps/sahana-demo/app index f5654c3..e85245b 100644 --- a/lxc-apps/sahana-demo/app +++ b/lxc-apps/sahana-demo/app @@ -1,5 +1,5 @@ { - "version": "1.0.3-200621", + "version": "1.0.3-201021", "meta": { "title": "Sahana Eden - Demo", "desc-cs": "Řízení humanítární činnosti - Demo instance", @@ -8,7 +8,7 @@ }, "containers": { "sahana-demo": { - "image": "sahana_1.0.3-200621", + "image": "sahana_1.0.3-201021", "depends": [ "sahana-demo-postgres" ], @@ -22,7 +22,7 @@ } }, "sahana-demo-postgres": { - "image": "postgis_3.0.0-200621", + "image": "postgis_3.0.1-201021", "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 27bf2d5..66cbb33 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_1.0.3-200621" +SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-201021" # 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 06100fc..ab931f1 100644 --- a/lxc-apps/sahana/app +++ b/lxc-apps/sahana/app @@ -1,5 +1,5 @@ { - "version": "1.0.3-200621", + "version": "1.0.3-201021", "meta": { "title": "Sahana Eden", "desc-cs": "Řízení humanítární činnosti", @@ -8,7 +8,7 @@ }, "containers": { "sahana": { - "image": "sahana_1.0.3-200621", + "image": "sahana_1.0.3-201021", "depends": [ "sahana-postgres" ], @@ -22,7 +22,7 @@ } }, "sahana-postgres": { - "image": "postgis_3.0.0-200621", + "image": "postgis_3.0.1-201021", "mounts": { "sahana/postgres_data": "var/lib/postgresql" } diff --git a/lxc-apps/sahana/image b/lxc-apps/sahana/image index 9691090..903efcf 100644 --- a/lxc-apps/sahana/image +++ b/lxc-apps/sahana/image @@ -1,16 +1,17 @@ -IMAGE sahana_1.0.3-200621 -FROM alpine3.11-python3.8_3.8.2-200621 +IMAGE sahana_1.0.3-201021 +FROM alpine3.12-python3.8_3.8.5-201021 RUN EOF # Install runtime dependencies apk --no-cache add ansible at geos nginx py3-dateutil py3-gdal py3-lxml py3-numpy py3-pillow py3-psycopg2 py3-requests py3-sgmllib3k py3-yaml uwsgi-python3 sudo # Install build dependencies - apk --no-cache add --virtual .deps build-base freetype-dev git py3-numpy-dev py3-pip python3-dev ttf-dejavu + apk --no-cache add --virtual .deps build-base freetype-dev git py3-numpy-dev python3-dev ttf-dejavu - # Install web2py + # Install web2py 2.20.4 + # See https://github.com/sahana/eden/blob/master/tests/travis/install_web2py.sh git clone --recursive https://github.com/web2py/web2py.git /srv/web2py - git -C /srv/web2py checkout 59700b8 + git -C /srv/web2py checkout 777c305 git -C /srv/web2py submodule update # Symlink WSGI handler @@ -20,12 +21,10 @@ RUN EOF git clone --recursive --depth 1 https://github.com/sahana/eden.git /srv/web2py/applications/eden # Install python dependencies, exclude old or unnecessary ones - sed -i 's/^Pillow/#Pillow/' /srv/web2py/applications/eden/optional_requirements.txt # We have 6.2.1, Sahana requires 6.2.2 sed -i 's/^boto/#boto/' /srv/web2py/applications/eden/optional_requirements.txt # Needed for setup on AWS sed -i 's/^PyRTF/#PyRTF/' /srv/web2py/applications/eden/optional_requirements.txt # Ceased to exist sed -i 's/^openst/#openst/' /srv/web2py/applications/eden/optional_requirements.txt # Needed for setup on OpenStack pip3 install -r /srv/web2py/applications/eden/optional_requirements.txt - pip3 install translate-toolkit # Hackfix paths for ansible and other modules with hardcoded paths ln -s /srv/web2py /home/prod @@ -43,12 +42,6 @@ RUN EOF adduser -S -u 8080 -h /srv/web2py -s /bin/false -g sahana -G sahana sahana chown -R sahana:sahana /srv/web2py - # Patch web2py for python 3.8 - cd /srv/web2py - patch -p0