diff options
| -rw-r--r-- | adei/Dockerfile | 3 | ||||
| -rwxr-xr-x | adei/scripts/adei-branch.sh | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/adei/Dockerfile b/adei/Dockerfile index 241eed8..0df22f3 100644 --- a/adei/Dockerfile +++ b/adei/Dockerfile @@ -16,7 +16,8 @@ RUN zypper ar http://download.opensuse.org/repositories/home:/csa7fff:/adei/open zypper -n in supervisor procmail alpine which w3m && \ zypper -n in perl perl-DateTime-Format-Strptime mailx && \ zypper -n in make java && \ - zypper -n in adei adei-config-default adei-req-mssql adei-webroot + zypper -n in adei adei-config-default adei-req-mssql adei-webroot && \ + zypper -n in bzr-webdav VOLUME /var/log/apache2 VOLUME /var/spool/mail diff --git a/adei/scripts/adei-branch.sh b/adei/scripts/adei-branch.sh index 4ba77ac..e56f792 100755 --- a/adei/scripts/adei-branch.sh +++ b/adei/scripts/adei-branch.sh @@ -35,6 +35,8 @@ LOCK_FILE=.lock cd /adei/src make + [ -n "$ADEI_REPOSITORY" ] && bzr config push_location=${ADEI_REPOSITORY}/adei + [ -d tmp ] && rm tmp ln -s ../tmp tmp chmod 0777 /adei/tmp @@ -58,10 +60,13 @@ LOCK_FILE=.lock if [[ "$setup" == *-logs ]]; then branch "http://darksoft.org/bzr/adei/setups/$setup" &> /dev/null [ $? -eq 0 ] || cp -ar /adei/src/setups/logs $setup - echo "here" else branch "http://darksoft.org/bzr/adei/setups/$setup" fi + ( + cd $setup + [ -n "$ADEI_REPOSITORY" -a -d .bzr ] && bzr config push_location=${ADEI_REPOSITORY}/adei-setups/$setup + ) ) fi if [ -d ../cfg/$setup ]; then |