summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorankitjavalkar2017-12-28 19:25:51 +0530
committerankitjavalkar2018-01-04 11:37:21 +0530
commit9a67cce12061fe63b526fdfbe03a03f6e859a044 (patch)
treebdfee5d90396d3086214ffebe5dbc17f709f13f8 /docker
parentca9e214a28dd0546855863041efe7e6d8de6710e (diff)
downloadonline_test-9a67cce12061fe63b526fdfbe03a03f6e859a044.tar.gz
online_test-9a67cce12061fe63b526fdfbe03a03f6e859a044.tar.bz2
online_test-9a67cce12061fe63b526fdfbe03a03f6e859a044.zip
Add docker related changes
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile_codeserver2
-rw-r--r--docker/Files/Docker-script.sh6
-rw-r--r--docker/Files/Start-codeserver.sh7
-rw-r--r--docker/docker-compose.yml2
4 files changed, 9 insertions, 8 deletions
diff --git a/docker/Dockerfile_codeserver b/docker/Dockerfile_codeserver
index 955e681..1f030d5 100644
--- a/docker/Dockerfile_codeserver
+++ b/docker/Dockerfile_codeserver
@@ -11,7 +11,7 @@ ADD Files/requirements-* /tmp/
RUN pip3 install -r /tmp/requirements-codeserver.txt && mkdir -p /Sites/online_test/yaksh_data/output /Sites/online_test/yaksh_data/data
-WORKDIR /Sites/online_test/yaksh_data
+WORKDIR /Sites/online_test
ADD Files/Start-codeserver.sh /Sites
diff --git a/docker/Files/Docker-script.sh b/docker/Files/Docker-script.sh
index 752a638..dc35a3f 100644
--- a/docker/Files/Docker-script.sh
+++ b/docker/Files/Docker-script.sh
@@ -1,5 +1,7 @@
#!/bin/bash
-chown -R www-data /Sites/online_test
-chmod -R 644 /Sites/online_test
+chown -R www-data /Sites/online_test
+chown -R www-data /Sites/online_test/yaksh
+chown -R nobody /Sites/online_test/yaksh_data
+chmod -R 664 /Sites/online_test
chmod -R +X /Sites
/usr/sbin/apache2ctl -D FOREGROUND
diff --git a/docker/Files/Start-codeserver.sh b/docker/Files/Start-codeserver.sh
index 8b6ea96..019a31d 100644
--- a/docker/Files/Start-codeserver.sh
+++ b/docker/Files/Start-codeserver.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-chown -R nobody /Sites/online_test
+chown -R nobody /Sites/online_test/yaksh_data
chmod -R a+rwX yaksh_data/output
-chmod -R a+rX yaksh_data/data yaksh_data/yaksh
-chmod -R o-w yaksh_data/data yaksh
-chmod -R +X /Sites/online_test/
+chmod -R a+rX yaksh_data/data
+chmod -R o-w yaksh_data/data
/usr/bin/sudo -su nobody python3 -m yaksh.code_server
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 747cbda..7ee3860 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -26,7 +26,7 @@ services:
image: yaksh.codeserver
container_name: yaksh_codeserver
volumes:
- - ../yaksh_data:/Sites/online_test/yaksh_data
+ - ..:/Sites/online_test
restart: always