diff --git a/yao-portal/dev/Dockerfile b/yao-portal/dev/Dockerfile index 89a6a77..e375ba4 100644 --- a/yao-portal/dev/Dockerfile +++ b/yao-portal/dev/Dockerfile @@ -1,6 +1,6 @@ FROM newnius/php:7.3 -MAINTAINER Newnius +MAINTAINER Newnius RUN apt update && \ apt install -y git vim httpie && \ @@ -8,8 +8,6 @@ RUN apt update && \ RUN git clone https://github.com/newnius/YAO-portal.git /var/www/html/ -ADD config/config.inc.php /var/www/html/ - ADD bootstrap.sh /etc/ CMD /etc/bootstrap.sh diff --git a/yao-portal/dev/bootstrap.sh b/yao-portal/dev/bootstrap.sh index aae920a..3640e20 100755 --- a/yao-portal/dev/bootstrap.sh +++ b/yao-portal/dev/bootstrap.sh @@ -1,23 +1,14 @@ #!/bin/bash if [[ -d /config/ ]]; then - if [[ ! -f /config/config.js ]]; then - cp /var/www/html/static/config.js /config/config.js - fi - if [[ ! -f /config/config.inc.php ]]; then cp /var/www/html/config.inc.php /config/config.inc.php fi fi -if [[ -f /config/config.js ]]; then - rm /var/www/html/static/config.js - ln -s /config/config.js /var/www/html/static/config.js -fi - if [[ -f /config/config.inc.php ]]; then rm /var/www/html/config.inc.php ln -s /config/config.inc.php /var/www/html/config.inc.php fi -apache2-foreground \ No newline at end of file +apache2-foreground diff --git a/yao-portal/dev/config/config.inc.php b/yao-portal/dev/config/config.inc.php deleted file mode 100755 index aedaf31..0000000 --- a/yao-portal/dev/config/config.inc.php +++ /dev/null @@ -1,52 +0,0 @@ -