diff --git a/Dockerfile b/Dockerfile index a377d4a..b30eb99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,10 +44,10 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list #RUN yes|apt install libgl1-mesa-glx #RUN yes|apt install redis-server -VOLUME ["/var/www/html/ptools/db"] +#VOLUME ["/var/www/html/ptools/db"] VOLUME ["/var/www/html/ptools"] -EXPOSE 8000 +EXPOSE $DJANGO_WEB_PORT #ENTRYPOINT ["redis-server","/etc/redis/redis.conf"] #ENTRYPOINT ["/bin/bash", "first.sh"] ENTRYPOINT ["/bin/bash", "/var/www/html/start.sh"] \ No newline at end of file diff --git a/start.sh b/start.sh index 77f0faf..502c1f1 100644 --- a/start.sh +++ b/start.sh @@ -1,5 +1,6 @@ #!/bin/bash - +# 升级pip到最新 +python -m pip install --upgrade pip CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER" if [ ! -e $CONTAINER_ALREADY_STARTED ]; then echo "-- First container startup --" @@ -13,8 +14,7 @@ if [ ! -e $CONTAINER_ALREADY_STARTED ]; then git pull git checkout master && git branch --set-upstream-to=origin/master master - python -m pip install --upgrade pip && - pip install -r requirements.txt && + pip install -r requirements.txt && python manage.py makemigrations && python manage.py migrate && python manage.py loaddata pt.json @@ -30,4 +30,4 @@ fi pip install -r requirements.txt && python manage.py makemigrations && python manage.py migrate && - python manage.py runserver $DJANGO_WEB_PORT --noreload + python manage.py runserver 0.0.0.0:$DJANGO_WEB_PORT --noreload