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

Bump Sahana to newer commit on Alpine 3.12

Browse Source 
Bumped web2py to 2.20.4, python 3 now officially fully supported
This commit is contained in:
Disassembler 2020-10-22 23:05:01 +02:00
parent 8428373178
commit 8bc038ea02
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
11 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lxc-apps/safire/app
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.3-200621", "version": "1.0.3-201021",
"meta": { "meta": {
"title": "Sahana Eden - SAFIRE", "title": "Sahana Eden - SAFIRE",
"desc-cs": "Řízení humanítární činnosti - Řešení nouzových událostí", "desc-cs": "Řízení humanítární činnosti - Řešení nouzových událostí",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"safire": { "safire": {
"image": "sahana_1.0.3-200621", "image": "sahana_1.0.3-201021",
"depends": [ "depends": [
"safire-postgres" "safire-postgres"
], ],
@ -23,7 +23,7 @@
} }
}, },
"safire-postgres": { "safire-postgres": {
"image": "postgis_3.0.0-200621", "image": "postgis_3.0.1-201021",
"mounts": { "mounts": {
"safire/postgres_data": "var/lib/postgresql" "safire/postgres_data": "var/lib/postgresql"
} }

2
lxc-apps/safire/install.sh
View File

@ -5,7 +5,7 @@ set -ev
POSTGRES_DATA="${VOLUMES_DIR}/safire/postgres_data" POSTGRES_DATA="${VOLUMES_DIR}/safire/postgres_data"
SAHANA_DATA="${VOLUMES_DIR}/safire/sahana_data" SAHANA_DATA="${VOLUMES_DIR}/safire/sahana_data"
SAHANA_CONF="${VOLUMES_DIR}/safire/sahana_conf" 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 # Create Postgres instance
install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}

6
lxc-apps/sahana-demo/app
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.3-200621", "version": "1.0.3-201021",
"meta": { "meta": {
"title": "Sahana Eden - Demo", "title": "Sahana Eden - Demo",
"desc-cs": "Řízení humanítární činnosti - Demo instance", "desc-cs": "Řízení humanítární činnosti - Demo instance",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"sahana-demo": { "sahana-demo": {
"image": "sahana_1.0.3-200621", "image": "sahana_1.0.3-201021",
"depends": [ "depends": [
"sahana-demo-postgres" "sahana-demo-postgres"
], ],
@ -22,7 +22,7 @@
} }
}, },
"sahana-demo-postgres": { "sahana-demo-postgres": {
"image": "postgis_3.0.0-200621", "image": "postgis_3.0.1-201021",
"mounts": { "mounts": {
"sahana-demo/postgres_data": "var/lib/postgresql" "sahana-demo/postgres_data": "var/lib/postgresql"
} }

2
lxc-apps/sahana-demo/install.sh
View File

@ -5,7 +5,7 @@ set -ev
POSTGRES_DATA="${VOLUMES_DIR}/sahana-demo/postgres_data" POSTGRES_DATA="${VOLUMES_DIR}/sahana-demo/postgres_data"
SAHANA_DATA="${VOLUMES_DIR}/sahana-demo/sahana_data" SAHANA_DATA="${VOLUMES_DIR}/sahana-demo/sahana_data"
SAHANA_CONF="${VOLUMES_DIR}/sahana-demo/sahana_conf" 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 # Create Postgres instance
install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}

6
lxc-apps/sahana/app
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.3-200621", "version": "1.0.3-201021",
"meta": { "meta": {
"title": "Sahana Eden", "title": "Sahana Eden",
"desc-cs": "Řízení humanítární činnosti", "desc-cs": "Řízení humanítární činnosti",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"sahana": { "sahana": {
"image": "sahana_1.0.3-200621", "image": "sahana_1.0.3-201021",
"depends": [ "depends": [
"sahana-postgres" "sahana-postgres"
], ],
@ -22,7 +22,7 @@
} }
}, },
"sahana-postgres": { "sahana-postgres": {
"image": "postgis_3.0.0-200621", "image": "postgis_3.0.1-201021",
"mounts": { "mounts": {
"sahana/postgres_data": "var/lib/postgresql" "sahana/postgres_data": "var/lib/postgresql"
} }

19
lxc-apps/sahana/image
View File

@ -1,16 +1,17 @@
IMAGE sahana_1.0.3-200621 IMAGE sahana_1.0.3-201021
FROM alpine3.11-python3.8_3.8.2-200621 FROM alpine3.12-python3.8_3.8.5-201021
RUN EOF RUN EOF
# Install runtime dependencies # 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 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 # 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 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 git -C /srv/web2py submodule update
# Symlink WSGI handler # Symlink WSGI handler
@ -20,12 +21,10 @@ RUN EOF
git clone --recursive --depth 1 https://github.com/sahana/eden.git /srv/web2py/applications/eden git clone --recursive --depth 1 https://github.com/sahana/eden.git /srv/web2py/applications/eden
# Install python dependencies, exclude old or unnecessary ones # 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/^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/^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 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 -r /srv/web2py/applications/eden/optional_requirements.txt
pip3 install translate-toolkit
# Hackfix paths for ansible and other modules with hardcoded paths # Hackfix paths for ansible and other modules with hardcoded paths
ln -s /srv/web2py /home/prod 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 adduser -S -u 8080 -h /srv/web2py -s /bin/false -g sahana -G sahana sahana
chown -R sahana:sahana /srv/web2py chown -R sahana:sahana /srv/web2py
# Patch web2py for python 3.8
cd /srv/web2py
patch -p0 </srv/web2py/applications/eden/private/eden_deploy/roles/common/files/_compat.patch
cd /srv/web2py/gluon
patch -p0 </srv/web2py/applications/eden/private/eden_deploy/roles/common/files/scheduler.diff
# Cleanup # Cleanup
apk --no-cache del .deps apk --no-cache del .deps
find /srv/web2py -name '.git*' -exec rm -rf {} + find /srv/web2py -name '.git*' -exec rm -rf {} +

2
lxc-apps/sahana/install.sh
View File

@ -5,7 +5,7 @@ set -ev
POSTGRES_DATA="${VOLUMES_DIR}/sahana/postgres_data" POSTGRES_DATA="${VOLUMES_DIR}/sahana/postgres_data"
SAHANA_DATA="${VOLUMES_DIR}/sahana/sahana_data" SAHANA_DATA="${VOLUMES_DIR}/sahana/sahana_data"
SAHANA_CONF="${VOLUMES_DIR}/sahana/sahana_conf" SAHANA_CONF="${VOLUMES_DIR}/sahana/sahana_conf"
SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621" SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-201021"
# Create Postgres instance # Create Postgres instance
install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}

6
lxc-apps/sambro/app
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.3-200621", "version": "1.0.3-201021",
"meta": { "meta": {
"title": "Sahana Eden - SAMBRO", "title": "Sahana Eden - SAMBRO",
"desc-cs": "Řízení humanítární činnosti - Centrum hlášení a výstrah", "desc-cs": "Řízení humanítární činnosti - Centrum hlášení a výstrah",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"sambro": { "sambro": {
"image": "sahana_1.0.3-200621", "image": "sahana_1.0.3-201021",
"depends": [ "depends": [
"sambro-postgres" "sambro-postgres"
], ],
@ -23,7 +23,7 @@
} }
}, },
"sambro-postgres": { "sambro-postgres": {
"image": "postgis_3.0.0-200621", "image": "postgis_3.0.1-201021",
"mounts": { "mounts": {
"sambro/postgres_data": "var/lib/postgresql" "sambro/postgres_data": "var/lib/postgresql"
} }

2
lxc-apps/sambro/install.sh
View File

@ -5,7 +5,7 @@ set -ev
POSTGRES_DATA="${VOLUMES_DIR}/sambro/postgres_data" POSTGRES_DATA="${VOLUMES_DIR}/sambro/postgres_data"
SAHANA_DATA="${VOLUMES_DIR}/sambro/sahana_data" SAHANA_DATA="${VOLUMES_DIR}/sambro/sahana_data"
SAHANA_CONF="${VOLUMES_DIR}/sambro/sahana_conf" SAHANA_CONF="${VOLUMES_DIR}/sambro/sahana_conf"
SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621" SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-201021"
# Create Postgres instance # Create Postgres instance
install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}

6
lxc-apps/share/app
View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.3-200621", "version": "1.0.3-201021",
"meta": { "meta": {
"title": "Sahana Eden - SHARE", "title": "Sahana Eden - SHARE",
"desc-cs": "Řízení humanítární činnosti - Úleva a rehabilitace", "desc-cs": "Řízení humanítární činnosti - Úleva a rehabilitace",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"share": { "share": {
"image": "sahana_1.0.3-200621", "image": "sahana_1.0.3-201021",
"depends": [ "depends": [
"share-postgres" "share-postgres"
], ],
@ -23,7 +23,7 @@
} }
}, },
"share-postgres": { "share-postgres": {
"image": "postgis_3.0.0-200621", "image": "postgis_3.0.1-201021",
"mounts": { "mounts": {
"share/postgres_data": "var/lib/postgresql" "share/postgres_data": "var/lib/postgresql"
} }

2
lxc-apps/share/install.sh
View File

@ -5,7 +5,7 @@ set -ev
POSTGRES_DATA="${VOLUMES_DIR}/share/postgres_data" POSTGRES_DATA="${VOLUMES_DIR}/share/postgres_data"
SAHANA_DATA="${VOLUMES_DIR}/share/sahana_data" SAHANA_DATA="${VOLUMES_DIR}/share/sahana_data"
SAHANA_CONF="${VOLUMES_DIR}/share/sahana_conf" SAHANA_CONF="${VOLUMES_DIR}/share/sahana_conf"
SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621" SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-201021"
# Create Postgres instance # Create Postgres instance
install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA} install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}