diff --git a/activemq/lxcfile b/activemq/lxcfile index a20ce2f..ff5ac05 100644 --- a/activemq/lxcfile +++ b/activemq/lxcfile @@ -20,7 +20,7 @@ EOF COPY lxc -MOUNT /srv/activemq/data srv/activemq/data +MOUNT DIR /srv/activemq/data srv/activemq/data USER 61616 61616 CMD /srv/activemq/bin/activemq console diff --git a/activemq/setup/etc/init.d/activemq b/activemq/setup/etc/init.d/activemq old mode 100644 new mode 100755 diff --git a/build-all.sh b/build-all.sh index 8aae443..bd1b09c 100755 --- a/build-all.sh +++ b/build-all.sh @@ -11,7 +11,6 @@ ln -s ${SOURCE_DIR}/zz-extra/fix-apk /usr/bin/fix-apk mkdir -p /var/lib/lxc/shared/alpine wget https://github.com/gliderlabs/docker-alpine/raw/2bfe6510ee31d86cfeb2f37587f4cf866f28ffbc/versions/library-3.8/x86_64/rootfs.tar.xz -O - | tar xJf - -C /var/lib/lxc/shared/alpine chmod 755 /var/lib/lxc/shared/alpine -touch /var/lib/lxc/shared/alpine/etc/resolv.conf lxc-build ${SOURCE_DIR}/basic-runtimes/alpine.lxcfile # Build shared overlays diff --git a/ckan-datapusher/lxcfile b/ckan-datapusher/lxcfile index ebe8abe..63a1399 100644 --- a/ckan-datapusher/lxcfile +++ b/ckan-datapusher/lxcfile @@ -21,9 +21,6 @@ RUN EOF sed -i 's/\[security\]//' /srv/ckan-datapusher/src/datapusher/requirements.txt pip install -r /srv/ckan-datapusher/src/datapusher/requirements.txt - # Prepare mountpoint for selfsigned certificate - touch /etc/ssl/services.pem - # Create OS user addgroup -S -g 8004 ckandp adduser -S -u 8004 -h /srv/ckan-datapusher -s /bin/false -g ckandp -G ckandp ckandp @@ -37,8 +34,8 @@ EOF COPY lxc -MOUNT /etc/ssl/services.pem etc/ssl/services.pem -MOUNT /srv/ckan-datapusher/conf etc/ckan-datapusher -MOUNT /srv/ckan-datapusher/data srv/ckan-datapusher/data +MOUNT FILE /etc/ssl/services.pem etc/ssl/services.pem +MOUNT DIR /srv/ckan-datapusher/conf etc/ckan-datapusher +MOUNT DIR /srv/ckan-datapusher/data srv/ckan-datapusher/data CMD execlineb -P /run diff --git a/ckan/lxcfile b/ckan/lxcfile index ef143c9..381bada 100644 --- a/ckan/lxcfile +++ b/ckan/lxcfile @@ -36,10 +36,6 @@ RUN EOF pip install -r /srv/ckan/src/ckanext-spatial/pip-requirements.txt pip install -r /srv/ckan/src/ckanext-dgvat-xls/requirements.txt - # Create mountpoints - mkdir /etc/ckan - mkdir /srv/ckan/storage - # Create OS user addgroup -S -g 8003 ckan adduser -S -u 8003 -h /srv/ckan -s /bin/false -g ckan -G ckan ckan @@ -51,8 +47,8 @@ RUN EOF rm -rf /root/.cache EOF -MOUNT /srv/ckan/conf etc/ckan -MOUNT /srv/ckan/data srv/ckan/storage +MOUNT DIR /srv/ckan/conf etc/ckan +MOUNT DIR /srv/ckan/data srv/ckan/storage USER 8003 8003 CMD paster serve /etc/ckan/ckan.ini diff --git a/crisiscleanup/lxcfile b/crisiscleanup/lxcfile index 4a211e2..5a821c9 100644 --- a/crisiscleanup/lxcfile +++ b/crisiscleanup/lxcfile @@ -51,7 +51,7 @@ RUN EOF rm -rf /root/.bundle /root/.config /root/.npm EOF -MOUNT /srv/crisiscleanup/conf srv/crisiscleanup/config +MOUNT DIR /srv/crisiscleanup/conf srv/crisiscleanup/config USER 8005 8005 WORKDIR /srv/crisiscleanup diff --git a/crisiscleanup/setup.sh b/crisiscleanup/setup.sh old mode 100644 new mode 100755 diff --git a/crisiscleanup/setup/etc/init.d/crisiscleanup b/crisiscleanup/setup/etc/init.d/crisiscleanup old mode 100644 new mode 100755 diff --git a/cts/lxcfile b/cts/lxcfile index a83be90..8964727 100644 --- a/cts/lxcfile +++ b/cts/lxcfile @@ -42,7 +42,7 @@ EOF COPY lxc -MOUNT /srv/cts/conf srv/cts/cts/settings +MOUNT DIR /srv/cts/conf srv/cts/cts/settings ENV DJANGO_SETTINGS_MODULE cts.settings.spotter WORKDIR /srv/cts diff --git a/frontlinesms/lxcfile b/frontlinesms/lxcfile index ccca1ce..5b572f1 100644 --- a/frontlinesms/lxcfile +++ b/frontlinesms/lxcfile @@ -27,6 +27,6 @@ EOF COPY lxc -MOUNT /srv/frontlinesms/data srv/frontlinesms/.frontlinesms2 +MOUNT DIR /srv/frontlinesms/data srv/frontlinesms/.frontlinesms2 CMD s6-svscan /etc/services.d diff --git a/gnuhealth/lxcfile b/gnuhealth/lxcfile index bf42f1f..f584ea0 100644 --- a/gnuhealth/lxcfile +++ b/gnuhealth/lxcfile @@ -47,7 +47,7 @@ RUN EOF rm -rf /usr/local/share/.cache EOF -MOUNT /srv/gnuhealth/conf srv/gnuhealth/gnuhealth/tryton/server/config +MOUNT DIR /srv/gnuhealth/conf srv/gnuhealth/gnuhealth/tryton/server/config USER 8008 8008 ENV PATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin diff --git a/kanboard/lxcfile b/kanboard/lxcfile index 4e90560..75d0726 100644 --- a/kanboard/lxcfile +++ b/kanboard/lxcfile @@ -43,7 +43,7 @@ EOF COPY lxc -MOUNT /srv/kanboard/data srv/kanboard/data/files -MOUNT /srv/kanboard/conf/config.php srv/kanboard/config.php +MOUNT DIR /srv/kanboard/data srv/kanboard/data/files +MOUNT FILE /srv/kanboard/conf/config.php srv/kanboard/config.php CMD s6-svscan /etc/services.d diff --git a/kanboard/setup.sh b/kanboard/setup.sh index a44a6e3..87d8a7d 100755 --- a/kanboard/setup.sh +++ b/kanboard/setup.sh @@ -12,7 +12,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | lxc-attach -u 5432 -g 5432 postgres -- ps cat /var/lib/lxc/kanboard/kanboard/srv/kanboard/app/Schema/Sql/postgres.sql | lxc-attach -u 5432 -g 5432 postgres -- sh -c "PGPASSWORD=${KANBOARD_PWD} psql kanboard kanboard" # Configure Kanboard -mkdir -p /srv/kanboard/conf /srv/kanboard/data/ +mkdir -p /srv/kanboard/conf /srv/kanboard/data chown -R 8009:8009 /srv/kanboard/data envsubst <${SOURCE_DIR}/srv/kanboard/conf/config.php >/srv/kanboard/conf/config.php export KANBOARD_ADMIN_USER=admin diff --git a/mariadb/lxcfile b/mariadb/lxcfile index 2ac028e..df72564 100644 --- a/mariadb/lxcfile +++ b/mariadb/lxcfile @@ -15,8 +15,8 @@ RUN EOF chown mysql:mysql /run/mysqld EOF -MOUNT /srv/mariadb/conf etc/mysql -MOUNT /srv/mariadb/data var/lib/mysql +MOUNT DIR /srv/mariadb/conf etc/mysql +MOUNT DIR /srv/mariadb/data var/lib/mysql USER 3306 3306 CMD mysqld diff --git a/mifosx/lxcfile b/mifosx/lxcfile index 048095c..7896122 100644 --- a/mifosx/lxcfile +++ b/mifosx/lxcfile @@ -39,8 +39,8 @@ RUN EOF rm /tmp/locale-cs.patch EOF -MOUNT /srv/mifosx/conf/server.xml srv/tomcat/conf/server.xml -MOUNT /srv/mifosx/conf/context.xml srv/tomcat/webapps/fineract-provider/META-INF/context.xml +MOUNT FILE /srv/mifosx/conf/server.xml srv/tomcat/conf/server.xml +MOUNT FILE /srv/mifosx/conf/context.xml srv/tomcat/webapps/fineract-provider/META-INF/context.xml USER 8012 8012 WORKDIR /srv/tomcat diff --git a/motech/lxcfile b/motech/lxcfile index 186714a..6f440fa 100644 --- a/motech/lxcfile +++ b/motech/lxcfile @@ -24,7 +24,7 @@ RUN EOF rm -f /tmp/motech.war EOF -MOUNT /srv/motech/conf srv/tomcat/.motech +MOUNT DIR /srv/motech/conf srv/tomcat/.motech USER 8013 8013 WORKDIR /srv/tomcat diff --git a/opendatakit-build/lxcfile b/opendatakit-build/lxcfile index f059bc8..6ecf606 100644 --- a/opendatakit-build/lxcfile +++ b/opendatakit-build/lxcfile @@ -40,7 +40,7 @@ EOF COPY lxc -MOUNT /etc/ssl/services.pem usr/local/share/ca-certificates/services.crt -MOUNT /srv/opendatakit-build/conf/config.yml srv/opendatakit-build/config.yml +MOUNT FILE /etc/ssl/services.pem usr/local/share/ca-certificates/services.crt +MOUNT FILE /srv/opendatakit-build/conf/config.yml srv/opendatakit-build/config.yml CMD s6-svscan /etc/services.d diff --git a/opendatakit/lxcfile b/opendatakit/lxcfile index bcbdc4a..09bf1ce 100644 --- a/opendatakit/lxcfile +++ b/opendatakit/lxcfile @@ -30,9 +30,9 @@ RUN EOF rm -rf /root/.gradle /root/.java /srv/opendatakit EOF -MOUNT /srv/opendatakit/conf/server.xml srv/tomcat/conf/server.xml -MOUNT /srv/opendatakit/conf/jdbc.properties srv/tomcat/webapps/ROOT/WEB-INF/classes/jdbc.properties -MOUNT /srv/opendatakit/conf/security.properties srv/tomcat/webapps/ROOT/WEB-INF/classes/security.properties +MOUNT FILE /srv/opendatakit/conf/server.xml srv/tomcat/conf/server.xml +MOUNT FILE /srv/opendatakit/conf/jdbc.properties srv/tomcat/webapps/ROOT/WEB-INF/classes/jdbc.properties +MOUNT FILE /srv/opendatakit/conf/security.properties srv/tomcat/webapps/ROOT/WEB-INF/classes/security.properties USER 8015 8015 WORKDIR /srv/tomcat diff --git a/openmapkit/lxcfile b/openmapkit/lxcfile index cc855a0..724181b 100644 --- a/openmapkit/lxcfile +++ b/openmapkit/lxcfile @@ -36,8 +36,8 @@ RUN EOF rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm EOF -MOUNT /srv/openmapkit/conf/settings.js srv/openmapkit/settings.js -MOUNT /srv/openmapkit/data srv/openmapkit/data +MOUNT FILE /srv/openmapkit/conf/settings.js srv/openmapkit/settings.js +MOUNT DIR /srv/openmapkit/data srv/openmapkit/data USER 8007 8007 ENV NODE_ENV production diff --git a/pandora/lxcfile b/pandora/lxcfile index b51550d..c74ceb9 100644 --- a/pandora/lxcfile +++ b/pandora/lxcfile @@ -90,8 +90,8 @@ RUN EOF rm -rf /root/.cache /root/.ox EOF -MOUNT /srv/pandora/conf srv/pandora/conf -MOUNT /srv/pandora/data srv/pandora/data +MOUNT DIR /srv/pandora/conf srv/pandora/conf +MOUNT DIR /srv/pandora/data srv/pandora/data WORKDIR /srv/pandora CMD s6-svscan /etc/services.d diff --git a/postgres/lxcfile b/postgres/lxcfile index 5d0de8c..7657628 100644 --- a/postgres/lxcfile +++ b/postgres/lxcfile @@ -18,7 +18,7 @@ RUN EOF chown postgres:postgres /run/postgresql EOF -MOUNT /srv/postgres/data var/lib/postgresql +MOUNT DIR /srv/postgres/data var/lib/postgresql USER 5432 5432 CMD postgres -D /var/lib/postgresql diff --git a/rabbitmq/lxcfile b/rabbitmq/lxcfile index db99e70..1c68eee 100644 --- a/rabbitmq/lxcfile +++ b/rabbitmq/lxcfile @@ -14,7 +14,7 @@ RUN EOF apk --no-cache add rabbitmq-server@edge EOF -MOUNT /srv/rabbitmq/data var/lib/rabbitmq/mnesia +MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia USER 5672 5672 ENV HOME /usr/lib/rabbitmq diff --git a/redis/lxcfile b/redis/lxcfile index e58b0ee..88ede7a 100644 --- a/redis/lxcfile +++ b/redis/lxcfile @@ -11,8 +11,8 @@ RUN EOF apk --no-cache add redis EOF -MOUNT /srv/redis/conf/redis.conf etc/redis.conf -MOUNT /srv/redis/data var/lib/redis +MOUNT FILE /srv/redis/conf/redis.conf etc/redis.conf +MOUNT DIR /srv/redis/data var/lib/redis USER 6379 6379 CMD redis-server /etc/redis.conf diff --git a/sahana-demo/lxcfile b/sahana-demo/lxcfile index a87b945..7b4d92c 100644 --- a/sahana-demo/lxcfile +++ b/sahana-demo/lxcfile @@ -4,9 +4,9 @@ LAYER shared/libxml LAYER shared/python2 LAYER sahana/sahana -MOUNT /srv/sahana/conf srv/web2py/applications/eden/models -MOUNT /srv/sahana/data/default srv/web2py/applications/eden/modules/templates/default -MOUNT /srv/sahana/data/databases srv/web2py/applications/eden/databases -MOUNT /srv/sahana/data/uploads srv/web2py/applications/eden/uploads +MOUNT DIR /srv/sahana/conf srv/web2py/applications/eden/models +MOUNT DIR /srv/sahana/data/default srv/web2py/applications/eden/modules/templates/default +MOUNT DIR /srv/sahana/data/databases srv/web2py/applications/eden/databases +MOUNT DIR /srv/sahana/data/uploads srv/web2py/applications/eden/uploads CMD s6-svscan /etc/services.d diff --git a/sahana-demo/setup.sh b/sahana-demo/setup.sh index cfa0c47..58c6cf0 100755 --- a/sahana-demo/setup.sh +++ b/sahana-demo/setup.sh @@ -15,7 +15,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | lxc-attach -u 5432 -g 5432 postgres -- ps mkdir -p /srv/sahana-demo/conf /srv/sahana-demo/data/databases /srv/sahana-demo/data/uploads /srv/sahana-demo/data/${TEMPLATE} chown -R 8001:8001 /srv/sahana-demo/conf /srv/sahana-demo/data cp -rp /var/lib/lxc/sahana/sahana/srv/web2py/applications/eden/models/. /srv/sahana-demo/conf -cp -rp /srv/web2py/applications/eden/modules/templates/${TEMPLATE}/. /srv/sahana-demo/data/${TEMPLATE} +cp -rp /var/lib/lxc/sahana/sahana/srv/web2py/applications/eden/modules/templates/${TEMPLATE}/. /srv/sahana-demo/data/${TEMPLATE} # Configure Sahana export SAHANADEMO_HMAC=$(head -c 18 /dev/urandom | base64) diff --git a/sahana/lxcfile b/sahana/lxcfile index 422b40d..1689de7 100644 --- a/sahana/lxcfile +++ b/sahana/lxcfile @@ -59,9 +59,9 @@ RUN EOF rm -r /root/.cache EOF -MOUNT /srv/sahana/conf srv/web2py/applications/eden/models -MOUNT /srv/sahana/data/Spotter srv/web2py/applications/eden/modules/templates/Spotter -MOUNT /srv/sahana/data/databases srv/web2py/applications/eden/databases -MOUNT /srv/sahana/data/uploads srv/web2py/applications/eden/uploads +MOUNT DIR /srv/sahana/conf srv/web2py/applications/eden/models +MOUNT DIR /srv/sahana/data/Spotter srv/web2py/applications/eden/modules/templates/Spotter +MOUNT DIR /srv/sahana/data/databases srv/web2py/applications/eden/databases +MOUNT DIR /srv/sahana/data/uploads srv/web2py/applications/eden/uploads CMD s6-svscan /etc/services.d diff --git a/sambro/lxcfile b/sambro/lxcfile index 6b1a048..24b5f96 100644 --- a/sambro/lxcfile +++ b/sambro/lxcfile @@ -4,9 +4,9 @@ LAYER shared/libxml LAYER shared/python2 LAYER sahana/sahana -MOUNT /srv/sahana/conf srv/web2py/applications/eden/models -MOUNT /srv/sahana/data/SAMBRO srv/web2py/applications/eden/modules/templates/SAMBRO -MOUNT /srv/sahana/data/databases srv/web2py/applications/eden/databases -MOUNT /srv/sahana/data/uploads srv/web2py/applications/eden/uploads +MOUNT DIR /srv/sahana/conf srv/web2py/applications/eden/models +MOUNT DIR /srv/sahana/data/SAMBRO srv/web2py/applications/eden/modules/templates/SAMBRO +MOUNT DIR /srv/sahana/data/databases srv/web2py/applications/eden/databases +MOUNT DIR /srv/sahana/data/uploads srv/web2py/applications/eden/uploads CMD s6-svscan /etc/services.d diff --git a/sambro/setup.sh b/sambro/setup.sh index 9bd4038..7bb6466 100755 --- a/sambro/setup.sh +++ b/sambro/setup.sh @@ -14,7 +14,7 @@ envsubst <${SOURCE_DIR}/createdb.sql | lxc-attach -u 5432 -g 5432 postgres -- ps mkdir -p /srv/sambro/conf /srv/sambro/data/databases /srv/sambro/data/uploads /srv/sambro/data/SAMBRO chown -R 8001:8001 /srv/sambro/conf /srv/sambro/data cp -rp /var/lib/lxc/sahana/sahana/srv/web2py/applications/eden/models/. /srv/sahana-demo/conf -cp -rp /srv/web2py/applications/eden/modules/templates/SAMBRO/. /srv/sahana-demo/data/SAMBRO +cp -rp /var/lib/lxc/sahana/sahana/srv/web2py/applications/eden/modules/templates/SAMBRO/. /srv/sahana-demo/data/SAMBRO # Configure SAMBRO export SAMBRO_HMAC=$(head -c 18 /dev/urandom | base64) diff --git a/seeddms/lxcfile b/seeddms/lxcfile index a2deba5..5a7e19d 100644 --- a/seeddms/lxcfile +++ b/seeddms/lxcfile @@ -45,7 +45,7 @@ RUN EOF rm -rf /srv/seeddms/data/conf /srv/seeddms/www/ext/example EOF -MOUNT /srv/seeddms/conf srv/seeddms/conf -MOUNT /srv/seeddms/data srv/seeddms/data +MOUNT DIR /srv/seeddms/conf srv/seeddms/conf +MOUNT DIR /srv/seeddms/data srv/seeddms/data CMD s6-svscan /etc/services.d diff --git a/seeddms/setup.sh b/seeddms/setup.sh index 7e4ac1d..aa4a549 100755 --- a/seeddms/setup.sh +++ b/seeddms/setup.sh @@ -14,8 +14,8 @@ cat ${SOURCE_DIR}/custom.sql | lxc-attach -u 5432 -g 5432 postgres -- psql seedd # Copy existing files into persistent storage mkdir -p /srv/seeddms/conf /srv/seeddms/data -cp -rp /var/lib/lxc/seddms/seeddms/srv/seeddms/conf/. /srv/seeddms/conf -cp -rp /var/lib/lxc/seddms/seeddms/srv/seeddms/data/. /srv/seeddms/data +cp -rp /var/lib/lxc/seeddms/seeddms/srv/seeddms/conf/. /srv/seeddms/conf +cp -rp /var/lib/lxc/seeddms/seeddms/srv/seeddms/data/. /srv/seeddms/data chown -R 8010:8010 /srv/seeddms/data # Configure SeedDMS diff --git a/setup-all.sh b/setup-all.sh index 497f5aa..898c7ec 100755 --- a/setup-all.sh +++ b/setup-all.sh @@ -19,6 +19,8 @@ ${SOURCE_DIR}/cts/setup.sh ${SOURCE_DIR}/frontlinesms/setup.sh ${SOURCE_DIR}/gnuhealth/setup.sh ${SOURCE_DIR}/kanboard/setup.sh +${SOURCE_DIR}/mifosx/setup.sh +${SOURCE_DIR}/motech/setup.sh ${SOURCE_DIR}/opendatakit/setup.sh ${SOURCE_DIR}/opendatakit-build/setup.sh ${SOURCE_DIR}/openmapkit/setup.sh diff --git a/sigmah/lxcfile b/sigmah/lxcfile index d70f2c4..621d3d5 100644 --- a/sigmah/lxcfile +++ b/sigmah/lxcfile @@ -28,9 +28,9 @@ EOF COPY lxc -MOUNT /srv/sigmah/data srv/sigmah/data -MOUNT /srv/sigmah/conf/persistence.xml srv/tomcat/webapps/sigmah/WEB-INF/classes/META-INF/persistence.xml -MOUNT /srv/sigmah/conf/sigmah.properties srv/tomcat/webapps/sigmah/WEB-INF/classes/sigmah.properties +MOUNT DIR /srv/sigmah/data srv/sigmah/data +MOUNT FILE /srv/sigmah/conf/persistence.xml srv/tomcat/webapps/sigmah/WEB-INF/classes/META-INF/persistence.xml +MOUNT FILE /srv/sigmah/conf/sigmah.properties srv/tomcat/webapps/sigmah/WEB-INF/classes/sigmah.properties USER 8011 8011 WORKDIR /srv/tomcat diff --git a/sigmah/setup.sh b/sigmah/setup.sh index ac0bd66..0fc1de2 100755 --- a/sigmah/setup.sh +++ b/sigmah/setup.sh @@ -36,7 +36,7 @@ sed -i "s|§UserFirstName§|${SIGMAH_ADMIN_USER}|g" /tmp/sigmah-newOrganizationL sed -i "s|§UserLocale§|en|g" /tmp/sigmah-newOrganizationLaunchScript.sql sed -i "s|\$2a\$10\$pMcTA1p9fefR8U9NoOPei.H0eq/TbbdSF27M0tn9iDWBrA4JHeCDC|${SIGMAH_ADMIN_HASH}|" /tmp/sigmah-newOrganizationLaunchScript.sql cat /tmp/sigmah-MinimumDataKit.sql | lxc-attach postgres -- sh -c "PGPASSWORD=${SIGMAH_PWD} psql -U sigmah sigmah" -cat /tmp/sigmah-newOrganizationLaunchScript.sql | lxc-attach postgres -- sh -c "PGPASSWORD=${SIGMAH_PWD} postgres psql -U sigmah sigmah" +cat /tmp/sigmah-newOrganizationLaunchScript.sql | lxc-attach postgres -- sh -c "PGPASSWORD=${SIGMAH_PWD} psql -U sigmah sigmah" rm -f /tmp/sigmah-MinimumDataKit.sql /tmp/sigmah-newOrganizationLaunchScript.sql vmmgr update-login sigmah "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}" diff --git a/solr/lxcfile b/solr/lxcfile index ba75892..2fef8c4 100644 --- a/solr/lxcfile +++ b/solr/lxcfile @@ -23,7 +23,7 @@ EOF COPY lxc -MOUNT /srv/solr/data var/lib/solr +MOUNT DIR /srv/solr/data var/lib/solr USER 8983 8983 CMD solr start -f diff --git a/ushahidi/lxcfile b/ushahidi/lxcfile index 663cd49..80c99b6 100644 --- a/ushahidi/lxcfile +++ b/ushahidi/lxcfile @@ -33,8 +33,8 @@ RUN EOF rm aura.patch EOF -MOUNT /srv/ushahidi/conf/env srv/ushahidi/platform/.env -MOUNT /srv/ushahidi/conf/config.json srv/ushahidi/config.json -MOUNT /srv/ushahidi/data srv/ushahidi/platform/application/media/uploads +MOUNT FILE /srv/ushahidi/conf/env srv/ushahidi/platform/.env +MOUNT FILE /srv/ushahidi/conf/config.json srv/ushahidi/config.json +MOUNT DIR /srv/ushahidi/data srv/ushahidi/platform/application/media/uploads CMD s6-svscan /etc/services.d diff --git a/zz-extra/lxc-build b/zz-extra/lxc-build index 3151955..caf57b4 100755 --- a/zz-extra/lxc-build +++ b/zz-extra/lxc-build @@ -19,8 +19,8 @@ lxc.rootfs.path = {rootfs} # Mounts lxc.mount.entry = shm dev/shm tmpfs rw,nodev,noexec,nosuid,relatime,mode=1777,create=dir 0 0 -lxc.mount.entry = /etc/hosts etc/hosts none bind 0 0 -lxc.mount.entry = /etc/resolv.conf etc/resolv.conf none bind 0 0 +lxc.mount.entry = /etc/hosts etc/hosts none bind,create=file 0 0 +lxc.mount.entry = /etc/resolv.conf etc/resolv.conf none bind,create=file 0 0 {mounts} # Init @@ -94,7 +94,7 @@ class LXCImage: self.copy_files(srcdst[1], srcdst[2] if len(srcdst) == 3 else '') elif line.startswith('MOUNT'): mount = line.split() - self.add_mount(mount[1], mount[2]) + self.add_mount(mount[1], mount[2], mount[3]) elif line.startswith('ENV'): env = line.split() self.add_env(env[1], env[2]) @@ -145,8 +145,8 @@ class LXCImage: dst = os.path.join(self.layers[-1], dst) copy_tree(src, dst) - def add_mount(self, src, dst): - self.mounts.append('lxc.mount.entry = {} {} none bind 0 0'.format(src, dst)) + def add_mount(self, type, src, dst): + self.mounts.append('lxc.mount.entry = {} {} none bind,create={} 0 0'.format(src, dst, type.lower())) self.rebuild_config() def add_env(self, key, value):