summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-03-21 22:04:23 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-03-21 22:04:23 +0100
commit2b3959be03480c80b686eadaa90fd72fac93a375 (patch)
tree3ee13496080e77fb07b0a8c9749695e16afbc9a4
parentb4d227b34e54bdbd1b97db4fd06fb1eb81271793 (diff)
downloadadei-2b3959be03480c80b686eadaa90fd72fac93a375.tar.gz
adei-2b3959be03480c80b686eadaa90fd72fac93a375.tar.bz2
adei-2b3959be03480c80b686eadaa90fd72fac93a375.tar.xz
adei-2b3959be03480c80b686eadaa90fd72fac93a375.zip
Add bzr-webdav and configure push repositories
-rw-r--r--adei/Dockerfile3
-rwxr-xr-xadei/scripts/adei-branch.sh7
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