From 29b3d12bfad8386c5e8b8afa4e565c8ed5a34afe Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Thu, 18 Aug 2016 17:31:36 +0200
Subject: [PATCH] Removed absolute pathes
---
ldap/run.sh | 7 +++++--
www/{docker => }/Dockerfile | 7 +++++--
www/build.sh | 4 +++-
www/{docker => misc}/entrypoint.sh | 0
www/{docker => misc}/ldapdb_base.py | 0
www/{docker => misc}/ldapdb_fields.py | 0
www/run_dev.sh | 14 ++++++++++++++
www/{run.sh => run_prod.sh} | 6 ++++--
8 files changed, 31 insertions(+), 7 deletions(-)
rename www/{docker => }/Dockerfile (82%)
rename www/{docker => misc}/entrypoint.sh (100%)
rename www/{docker => misc}/ldapdb_base.py (100%)
rename www/{docker => misc}/ldapdb_fields.py (100%)
create mode 100644 www/run_dev.sh
rename www/{run.sh => run_prod.sh} (60%)
diff --git a/ldap/run.sh b/ldap/run.sh
index b52fa95..e660eaa 100644
--- a/ldap/run.sh
+++ b/ldap/run.sh
@@ -1,11 +1,14 @@
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
docker kill ldap-service phpldapadmin-service
docker rm ldap-service phpldapadmin-service
docker run \
--env LDAP_ORGANISATION="Warpzone" \
--env LDAP_DOMAIN="warpzone.ms" \
--env LDAP_ADMIN_PASSWORD="k7dAw8j2" \
- --volume /opt/warpzone/ldap/data/database:/var/lib/ldap \
- --volume /opt/warpzone/ldap/data/config:/etc/ldap/slapd.d \
+ --volume $SCRIPTPATH/data/database:/var/lib/ldap \
+ --volume $SCRIPTPATH/data/config:/etc/ldap/slapd.d \
--name ldap-service \
--hostname ldap-service \
--detach osixia/openldap:latest
diff --git a/www/docker/Dockerfile b/www/Dockerfile
similarity index 82%
rename from www/docker/Dockerfile
rename to www/Dockerfile
index 1a1da0a..a35c6c9 100644
--- a/www/docker/Dockerfile
+++ b/www/Dockerfile
@@ -32,8 +32,11 @@ RUN pip3 install \
RUN ln -s /opt/nginx/nginx_warpinfra.conf /etc/nginx/sites-enabled/
RUN rm /etc/nginx/sites-enabled/default
-COPY ldapdb_base.py /usr/local/lib/python2.7/dist-packages/ldapdb/backends/ldap/base.py
-COPY entrypoint.sh /opt/entrypoint.sh
+COPY misc/ldapdb_base.py /usr/local/lib/python2.7/dist-packages/ldapdb/backends/ldap/base.py
+COPY misc/entrypoint.sh /opt/entrypoint.sh
+
+ADD web /opt/warpinfra/
+ADD nginx /opt/nginx
EXPOSE 8000
diff --git a/www/build.sh b/www/build.sh
index 51abdce..787df73 100644
--- a/www/build.sh
+++ b/www/build.sh
@@ -1 +1,3 @@
-cd docker; docker build -t warpinfra .; cd -
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+docker build -t warpinfra $SCRIPTPATH/.
\ No newline at end of file
diff --git a/www/docker/entrypoint.sh b/www/misc/entrypoint.sh
similarity index 100%
rename from www/docker/entrypoint.sh
rename to www/misc/entrypoint.sh
diff --git a/www/docker/ldapdb_base.py b/www/misc/ldapdb_base.py
similarity index 100%
rename from www/docker/ldapdb_base.py
rename to www/misc/ldapdb_base.py
diff --git a/www/docker/ldapdb_fields.py b/www/misc/ldapdb_fields.py
similarity index 100%
rename from www/docker/ldapdb_fields.py
rename to www/misc/ldapdb_fields.py
diff --git a/www/run_dev.sh b/www/run_dev.sh
new file mode 100644
index 0000000..48e1990
--- /dev/null
+++ b/www/run_dev.sh
@@ -0,0 +1,14 @@
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+docker kill warpinfra
+docker rm warpinfra
+
+docker run \
+ -v $SCRIPTPATH/web:/opt/warpinfra \
+ -v $SCRIPTPATH/nginx:/opt/nginx \
+ --link ldap-service:ldap \
+ --name warpinfra \
+ -p 8000:443 \
+ -itd \
+ warpinfra
diff --git a/www/run.sh b/www/run_prod.sh
similarity index 60%
rename from www/run.sh
rename to www/run_prod.sh
index 5924b83..1a0869b 100644
--- a/www/run.sh
+++ b/www/run_prod.sh
@@ -1,9 +1,11 @@
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+$SCRIPTPATH/build.sh
docker kill warpinfra
docker rm warpinfra
docker run \
- -v /opt/warpzone/www/web:/opt/warpinfra \
- -v /opt/warpzone/www/nginx:/opt/nginx \
--link ldap-service:ldap \
--name warpinfra \
-p 8000:443 \
--
GitLab