From 741b5ec94696c94f3fc48991e253d829aa60a943 Mon Sep 17 00:00:00 2001 From: Marllus Lustosa Date: Mon, 16 Dec 2019 16:35:50 -0300 Subject: [PATCH] first commit --- Dockerfile | 20 +------------------- docker-compose.yaml | 19 +++++++++---------- frontend/start.sh | 12 ++++++++++++ nginx/default.site-example | 3 ++- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index 52afccc..42e68f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,31 +11,13 @@ RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \ && npm install -g yuglify@0.1.4 \ && gem install sass -v 3.4.22 -ARG DB_NAME=pol -ARG DB_USER=root -ARG DB_PASSWORD=toor -ARG DB_HOST=127.0.0.1 -ARG DB_PORT=3306 -ARG TIME_ZONE=UTC - -EXPOSE 80 WORKDIR /app ADD . . RUN pip install -r requirements.txt RUN cp ./nginx/default.site-example /etc/nginx/sites-available/default \ - && cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py \ - && sed -i -E -e "s/(DEBUG = ).*/\1True/" \ - -e "s/('NAME': ')pol(',)/\1${DB_NAME}\2/" \ - -e "s/('USER': ')root(',)/\1${DB_USER}\2/" \ - -e "s/('PASSWORD': ')toor(',)/\1${DB_PASSWORD}\2/" \ - -e "s/('HOST': ')127\.0\.0\.1(',)/\1${DB_HOST}\2/" \ - -e "s/('PORT': ')3306(',)/\1${DB_PORT}\2/" \ - -e "s/(TIME_ZONE = ').*/\1${TIME_ZONE}'/" \ - -e "s/when\ Fixnum/when\ Integer/" \ - ./frontend/frontend/settings.py \ - && service nginx reload + && cp ./frontend/frontend/settings.py.example ./frontend/frontend/settings.py RUN cd /var/lib/gems/2.5.0/gems/sass-3.4.22/lib/sass/ \ && sed -i "s/when\ Fixnum/when\ Integer/" util.rb diff --git a/docker-compose.yaml b/docker-compose.yaml index 322cfcf..228029b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,13 +4,14 @@ services: politepol: build: context: . - args: - - DB_NAME=politepol - - DB_USER=rooooooooooot - - DB_PASSWORD=toooooooooooor - - DB_HOST=dbpolitepol - - DB_PORT=3306 - - TIME_ZONE=America\/Fortaleza + environment: + DB_NAME: 'politepol' + DB_USER: 'rooooooooooot' + DB_PASSWORD: 'toooooooooooor' + DB_HOST: 'dbpolitepol' + DB_PORT: '3306' + WEB_PORT: '8088' + TIME_ZONE: 'America\/Fortaleza' image: politepol:latest depends_on: - 'dbpolitepol' @@ -20,7 +21,7 @@ services: networks: - politepol-network ports: - - "8088:8088" + - '8088:8088' dbpolitepol: image: mysql:5.7 @@ -31,8 +32,6 @@ services: MYSQL_USER: 'rooooooooooot' MYSQL_PASSWORD: 'toooooooooooor' MYSQL_ROOT_PASSWORD: 'rootpass' - ports: - - '3306:3306' networks: - politepol-network volumes: diff --git a/frontend/start.sh b/frontend/start.sh index 4327d44..5890003 100644 --- a/frontend/start.sh +++ b/frontend/start.sh @@ -1,5 +1,17 @@ #!/bin/bash +sed -i -E -e "s/(DEBUG = ).*/\1True/" \ + -e "s/('NAME': ')pol(',)/\1${DB_NAME}\2/" \ + -e "s/('USER': ')root(',)/\1${DB_USER}\2/" \ + -e "s/('PASSWORD': ')toor(',)/\1${DB_PASSWORD}\2/" \ + -e "s/('HOST': ')127\.0\.0\.1(',)/\1${DB_HOST}\2/" \ + -e "s/('PORT': ')3306(',)/\1${DB_PORT}\2/" \ + -e "s/(TIME_ZONE = ').*/\1${TIME_ZONE}'/" \ + ./frontend/settings.py + +sed -i -e 's/listen\ 80/listen\ '${WEB_PORT}'/g' \ + -e 's/\[::\]:80/\[::\]:'${WEB_PORT}'/g' /etc/nginx/sites-available/default \ + && service nginx reload service nginx start > /dev/null diff --git a/nginx/default.site-example b/nginx/default.site-example index 197db21..2b5069c 100644 --- a/nginx/default.site-example +++ b/nginx/default.site-example @@ -7,12 +7,13 @@ server { server_name _; location / { + proxy_set_header X-Real-IP $remote_addr; proxy_pass http://127.0.0.1:8000; } location /downloader { proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://127.0.0.1:1234; + proxy_pass http://127.0.0.1:1234; } location /feed {