v/pol
1
0
Fork 0
mirror of https://github.com/taroved/pol synced 2025-05-29 04:20:09 -07:00
Code Issues Releases Wiki Activity

Merge pull request #35 from marlluslustosa/master

Browse Source 
wait-for-it.sh edited - ok
This commit is contained in:
Alexandr Nesterenko 2019-12-17 17:28:38 +03:00 committed by GitHub
commit 45334778e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -22,6 +22,7 @@ RUN cp ./nginx/default.site-example /etc/nginx/sites-available/default \
RUN cd /var/lib/gems/2.5.0/gems/sass-3.4.22/lib/sass/ \ RUN cd /var/lib/gems/2.5.0/gems/sass-3.4.22/lib/sass/ \
&& sed -i "s/when\ Fixnum/when\ Integer/" util.rb && sed -i "s/when\ Fixnum/when\ Integer/" util.rb
WORKDIR ./frontend #WORKDIR ./frontend
RUN chmod +x ./wait-for-it.sh
ENTRYPOINT ["/bin/bash", "start.sh"] #ENTRYPOINT ["/bin/bash", "start.sh"]

2
docker-compose.yaml
View File

@ -15,7 +15,7 @@ services:
image: politepol:latest image: politepol:latest
depends_on: depends_on:
- 'dbpolitepol' - 'dbpolitepol'
command: ["./wait-for-it.sh", "db:3306", "--", "/bin/bash", "./frontend/start.sh"] command: ["./wait-for-it.sh", "dbpolitepol:3306", "--", "/bin/bash", "./frontend/start.sh"]
container_name: politepol container_name: politepol
restart: unless-stopped restart: unless-stopped
networks: networks:

10
frontend/start.sh
View File

@ -7,7 +7,7 @@ sed -i -E -e "s/(DEBUG = ).*/\1True/" \
-e "s/('HOST': ')127\.0\.0\.1(',)/\1${DB_HOST}\2/" \ -e "s/('HOST': ')127\.0\.0\.1(',)/\1${DB_HOST}\2/" \
-e "s/('PORT': ')3306(',)/\1${DB_PORT}\2/" \ -e "s/('PORT': ')3306(',)/\1${DB_PORT}\2/" \
-e "s/(TIME_ZONE = ').*/\1${TIME_ZONE}'/" \ -e "s/(TIME_ZONE = ').*/\1${TIME_ZONE}'/" \
./frontend/settings.py ./frontend/frontend/settings.py
sed -i -e 's/listen\ 80/listen\ '${WEB_PORT}'/g' \ sed -i -e 's/listen\ 80/listen\ '${WEB_PORT}'/g' \
-e 's/\[::\]:80/\[::\]:'${WEB_PORT}'/g' /etc/nginx/sites-available/default \ -e 's/\[::\]:80/\[::\]:'${WEB_PORT}'/g' /etc/nginx/sites-available/default \
@ -15,8 +15,8 @@ sed -i -e 's/listen\ 80/listen\ '${WEB_PORT}'/g' \
service nginx start > /dev/null service nginx start > /dev/null
/usr/bin/python manage.py migrate /usr/bin/python ./frontend/manage.py migrate
/usr/bin/python manage.py loaddata fields.json /usr/bin/python ./frontend/manage.py loaddata fields.json
/usr/bin/python ../downloader.py & /usr/bin/python ./downloader.py &
/usr/bin/python manage.py runserver /usr/bin/python ./frontend/manage.py runserver