From 4c5568f8071fb91e4336dc684eb73ee7b888634a Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 13 Sep 2018 19:17:29 +0200 Subject: [PATCH] amendments --- ckan-datapusher/lxcfile | 6 +++--- crisiscleanup/lxcfile | 2 +- gnuhealth/lxcfile | 2 +- zz-extra/lxc-build | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ckan-datapusher/lxcfile b/ckan-datapusher/lxcfile index d770c15..ebe8abe 100644 --- a/ckan-datapusher/lxcfile +++ b/ckan-datapusher/lxcfile @@ -37,8 +37,8 @@ EOF COPY lxc -VOLUME /etc/ssl/services.pem etc/ssl/services.pem -VOLUME /srv/ckan-datapusher/conf etc/ckan-datapusher -VOLUME /srv/ckan-datapusher/data srv/ckan-datapusher/data +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 CMD execlineb -P /run diff --git a/crisiscleanup/lxcfile b/crisiscleanup/lxcfile index 11c12d0..4a211e2 100644 --- a/crisiscleanup/lxcfile +++ b/crisiscleanup/lxcfile @@ -51,7 +51,7 @@ RUN EOF rm -rf /root/.bundle /root/.config /root/.npm EOF -VOLUME /srv/crisiscleanup/conf srv/crisiscleanup/config +MOUNT /srv/crisiscleanup/conf srv/crisiscleanup/config USER 8005 8005 WORKDIR /srv/crisiscleanup diff --git a/gnuhealth/lxcfile b/gnuhealth/lxcfile index da0d734..bf42f1f 100644 --- a/gnuhealth/lxcfile +++ b/gnuhealth/lxcfile @@ -50,7 +50,7 @@ EOF MOUNT /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/sbin:/usr/bin:/sbin:/bin +ENV PATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV TRYTOND_CONFIG /srv/gnuhealth/gnuhealth/tryton/server/config/trytond.conf ENV PYTHONPATH /srv/gnuhealth/gnuhealth/tryton/server/trytond-4.2.15:/srv/gnuhealth/gnuhealth/tryton/server/config CMD trytond --verbose diff --git a/zz-extra/lxc-build b/zz-extra/lxc-build index cfd8d02..3151955 100755 --- a/zz-extra/lxc-build +++ b/zz-extra/lxc-build @@ -30,7 +30,7 @@ lxc.init.gid = {gid} lxc.init.cwd = {cwd} # Environment -lxc.environment = PATH=/usr/sbin:/usr/bin:/sbin:/bin +lxc.environment = PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin {env} # Halt