first commit

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 \
+    && 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
 
 RUN cd /var/lib/gems/2.5.0/gems/sass-3.4.22/lib/sass/ \
     && sed -i "s/when\ Fixnum/when\ Integer/" util.rb

docker-compose.yaml

@@ -4,13 +4,14 @@ services:
   politepol:
     build:
       context: .
-      args:
+    environment:
-        - DB_NAME=politepol
+      DB_NAME: 'politepol'
-        - DB_USER=rooooooooooot
+      DB_USER: 'rooooooooooot'
-        - DB_PASSWORD=toooooooooooor
+      DB_PASSWORD: 'toooooooooooor'
-        - DB_HOST=dbpolitepol
+      DB_HOST: 'dbpolitepol'
-        - DB_PORT=3306
+      DB_PORT: '3306'
-        - TIME_ZONE=America\/Fortaleza
+      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:

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
 

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 {