diff --git a/basic-runtimes/php/Dockerfile b/basic-runtimes/php/Dockerfile index 7849d57..e31da88 100644 --- a/basic-runtimes/php/Dockerfile +++ b/basic-runtimes/php/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine -MAINTAINER Disassembler - -RUN \ - # Install PHP runtime - apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session +FROM alpine +MAINTAINER Disassembler + +RUN \ + # Install PHP runtime + 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/basic-runtimes/python2/Dockerfile b/basic-runtimes/python2/Dockerfile index e5b1575..5c662ba 100644 --- a/basic-runtimes/python2/Dockerfile +++ b/basic-runtimes/python2/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine -MAINTAINER Disassembler - -RUN \ - # Install XML libs - apk --no-cache add libxml2 libxslt - -RUN \ - # Install Python2 runtime - apk --no-cache add python2 +FROM alpine +MAINTAINER Disassembler + +RUN \ + # Install XML libs + apk --no-cache add libxml2 libxslt + +RUN \ + # Install Python2 runtime + apk --no-cache add python2 diff --git a/basic-runtimes/python3/Dockerfile b/basic-runtimes/python3/Dockerfile index 2832c53..4b5ff09 100644 --- a/basic-runtimes/python3/Dockerfile +++ b/basic-runtimes/python3/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine -MAINTAINER Disassembler - -RUN \ - # Install XML libs - apk --no-cache add libxml2 libxslt - -RUN \ - # Install Python3 runtime - apk --no-cache add python3 \ - && ln -s /usr/bin/python3 /usr/bin/python +FROM alpine +MAINTAINER Disassembler + +RUN \ + # Install XML libs + apk --no-cache add libxml2 libxslt + +RUN \ + # Install Python3 runtime + apk --no-cache add python3 \ + && ln -s /usr/bin/python3 /usr/bin/python diff --git a/basic/Dockerfile b/basic/Dockerfile index a3689b7..1019df7 100644 --- a/basic/Dockerfile +++ b/basic/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.7 -MAINTAINER Disassembler - -RUN \ - # Install S6 supervisor - apk --no-cache add s6 +FROM alpine:3.7 +MAINTAINER Disassembler + +RUN \ + # Install S6 supervisor + apk --no-cache add s6 diff --git a/basic/srv/config.json b/basic/srv/config.json index 4b7670a..e0ce732 100644 --- a/basic/srv/config.json +++ b/basic/srv/config.json @@ -1,134 +1,134 @@ -{ - "apps":{ - "ckan":{ - "host":"ckan", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "crisiscleanup":{ - "host":"cc", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "cts":{ - "host":"cts", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "frontlinesms":{ - "host":"sms", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "gnuhealth":{ - "host":"gh", - "login":"N/A", - "password":"N/A", - "tiles":["gnuhealth-clients"], - "tiles-shown":false - }, - "kanboard":{ - "host":"kb", - "login":"N/A", - "password":"N/A", - "tiles":["kanboard-mobile"], - "tiles-shown":false - }, - "mifosx":{ - "host":"mifosx", - "login":"N/A", - "password":"N/A", - "tiles":["mifosx-mobile"], - "tiles-shown":false - }, - "motech":{ - "host":"motech", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "opendatakit":{ - "host":"odk", - "login":"N/A", - "password":"N/A", - "tiles":["opendatakit-clients"], - "tiles-shown":false - }, - "opendatakit-build":{ - "host":"odkbuild", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "openmapkit":{ - "host":"omk", - "login":"N/A", - "password":"N/A", - "tiles":["geoodk-clients", "openmapkit-clients"], - "tiles-shown":false - }, - "pandora":{ - "host":"pandora", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "sahana":{ - "host":"sahana", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "sahana-demo":{ - "host":"sahana-demo", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "sambro":{ - "host":"sambro", - "login":"N/A", - "password":"N/A", - "tiles":["sambro-mobile"], - "tiles-shown":false - }, - "seeddms":{ - "host":"dms", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "sigmah":{ - "host":"sigmah", - "login":"N/A", - "password":"N/A", - "tiles":[], - "tiles-shown":false - }, - "ushahidi":{ - "host":"ush", - "login":"N/A", - "password":"N/A", - "tiles":["ushahidi-mobile"], - "tiles-shown":false - } - }, - "host":{ - "domain":"spotter.vm", - "port": "443" - } -} +{ + "apps":{ + "ckan":{ + "host":"ckan", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "crisiscleanup":{ + "host":"cc", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "cts":{ + "host":"cts", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "frontlinesms":{ + "host":"sms", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "gnuhealth":{ + "host":"gh", + "login":"N/A", + "password":"N/A", + "tiles":["gnuhealth-clients"], + "tiles-shown":false + }, + "kanboard":{ + "host":"kb", + "login":"N/A", + "password":"N/A", + "tiles":["kanboard-mobile"], + "tiles-shown":false + }, + "mifosx":{ + "host":"mifosx", + "login":"N/A", + "password":"N/A", + "tiles":["mifosx-mobile"], + "tiles-shown":false + }, + "motech":{ + "host":"motech", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "opendatakit":{ + "host":"odk", + "login":"N/A", + "password":"N/A", + "tiles":["opendatakit-clients"], + "tiles-shown":false + }, + "opendatakit-build":{ + "host":"odkbuild", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "openmapkit":{ + "host":"omk", + "login":"N/A", + "password":"N/A", + "tiles":["geoodk-clients", "openmapkit-clients"], + "tiles-shown":false + }, + "pandora":{ + "host":"pandora", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "sahana":{ + "host":"sahana", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "sahana-demo":{ + "host":"sahana-demo", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "sambro":{ + "host":"sambro", + "login":"N/A", + "password":"N/A", + "tiles":["sambro-mobile"], + "tiles-shown":false + }, + "seeddms":{ + "host":"dms", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "sigmah":{ + "host":"sigmah", + "login":"N/A", + "password":"N/A", + "tiles":[], + "tiles-shown":false + }, + "ushahidi":{ + "host":"ush", + "login":"N/A", + "password":"N/A", + "tiles":["ushahidi-mobile"], + "tiles-shown":false + } + }, + "host":{ + "domain":"spotter.vm", + "port": "443" + } +} diff --git a/mifosx/adminpwd.sql b/mifosx/adminpwd.sql index bf19c45..7d5dc85 100644 --- a/mifosx/adminpwd.sql +++ b/mifosx/adminpwd.sql @@ -1,6 +1,6 @@ -UPDATE `m_appuser` SET `username` = "${MIFOSX_ADMIN_USER}", `password` = "${MIFOSX_ADMIN_HASH}", `email` = "${MIFOSX_ADMIN_EMAIL}" WHERE `id` = 1; - -UPDATE `c_external_service_properties` SET `value` = "mifosx@spotter.ngo" WHERE `external_service_id` = 2 and `name` LIKE "username"; -UPDATE `c_external_service_properties` SET `value` = "" WHERE `external_service_id` = 2 and `name` LIKE "password"; -UPDATE `c_external_service_properties` SET `value` = "postfix" WHERE `external_service_id` = 2 and `name` LIKE "host"; -UPDATE `c_external_service_properties` SET `value` = "false" WHERE `external_service_id` = 2 and `name` LIKE "useTLS"; +UPDATE `m_appuser` SET `username` = "${MIFOSX_ADMIN_USER}", `password` = "${MIFOSX_ADMIN_HASH}", `email` = "${MIFOSX_ADMIN_EMAIL}" WHERE `id` = 1; + +UPDATE `c_external_service_properties` SET `value` = "mifosx@spotter.ngo" WHERE `external_service_id` = 2 and `name` LIKE "username"; +UPDATE `c_external_service_properties` SET `value` = "" WHERE `external_service_id` = 2 and `name` LIKE "password"; +UPDATE `c_external_service_properties` SET `value` = "postfix" WHERE `external_service_id` = 2 and `name` LIKE "host"; +UPDATE `c_external_service_properties` SET `value` = "false" WHERE `external_service_id` = 2 and `name` LIKE "useTLS"; diff --git a/openmapkit/Dockerfile b/openmapkit/Dockerfile index 04f80a2..fe8c853 100644 --- a/openmapkit/Dockerfile +++ b/openmapkit/Dockerfile @@ -1,42 +1,42 @@ -FROM java -MAINTAINER Disassembler - -RUN \ - # Install NodeJS runtime - apk --no-cache add nodejs paxctl \ - # Fix grsec attributes to loosen memory protection restrictions - && paxctl -cm /usr/bin/node \ - # Cleanup - && apk --no-cache del paxctl - -RUN \ - # Install runtime dependencies - apk --no-cache add python2 - -RUN \ - # Install build dependencies - apk --no-cache add --virtual .deps build-base git py2-pip \ - # Clone OpenMapKit - && git clone --depth 1 https://github.com/posm/OpenMapKitServer /srv/openmapkit \ - && cd /srv/openmapkit \ - && git submodule update --init \ - # Install OpenMapKit dependencies - && pip install -r requirements.txt \ - && npm install libxmljs \ - && npm install \ - # Create OS user - && addgroup -S -g 8007 omk \ - && adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \ - && chown -R omk:omk /srv/openmapkit \ - # Cleanup - && apk --no-cache del .deps \ - && find /srv/openmapkit -name '.git*' -exec rm -rf {} + \ - && rm -rf /usr/local/share/.cache \ - && rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm - -COPY docker/ / - -VOLUME ["/srv/openmapkit/data"] -EXPOSE 8080 - -CMD ["s6-svscan", "/etc/services.d"] +FROM java +MAINTAINER Disassembler + +RUN \ + # Install NodeJS runtime + apk --no-cache add nodejs paxctl \ + # Fix grsec attributes to loosen memory protection restrictions + && paxctl -cm /usr/bin/node \ + # Cleanup + && apk --no-cache del paxctl + +RUN \ + # Install runtime dependencies + apk --no-cache add python2 + +RUN \ + # Install build dependencies + apk --no-cache add --virtual .deps build-base git py2-pip \ + # Clone OpenMapKit + && git clone --depth 1 https://github.com/posm/OpenMapKitServer /srv/openmapkit \ + && cd /srv/openmapkit \ + && git submodule update --init \ + # Install OpenMapKit dependencies + && pip install -r requirements.txt \ + && npm install libxmljs \ + && npm install \ + # Create OS user + && addgroup -S -g 8007 omk \ + && adduser -S -u 8007 -h /srv/openmapkit -s /bin/false -g omk -G omk omk \ + && chown -R omk:omk /srv/openmapkit \ + # Cleanup + && apk --no-cache del .deps \ + && find /srv/openmapkit -name '.git*' -exec rm -rf {} + \ + && rm -rf /usr/local/share/.cache \ + && rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm + +COPY docker/ / + +VOLUME ["/srv/openmapkit/data"] +EXPOSE 8080 + +CMD ["s6-svscan", "/etc/services.d"]