Merge pull request #320 from ita-social-projects/#First-deploy

#first deploy

.github/workflows/django_cd_dev.yml

@@ -20,6 +20,7 @@ env:
     CORS_ORIGIN_WHITELIST: ${{ vars.CORS_ORIGIN_WHITELIST }}
     REACT_APP_BASE_API_URL: ${{ vars.REACT_APP_BASE_API_URL }}
     REACT_APP_PUBLIC_URL: ${{ vars.REACT_APP_PUBLIC_URL }}
+    ALLOWED_ENV_HOST: ${{ vars.ALLOWED_ENV_HOST }}
 
 jobs:
   deploy:
@@ -37,6 +38,10 @@ jobs:
         run: docker compose -f docker-compose.dev.yml exec ${{ vars.API_DEV }} python manage.py migrate --noinput
       - name: Docker compouse COLLECTSTATIC
         run: docker compose -f docker-compose.dev.yml exec ${{ vars.API_DEV }} python manage.py collectstatic --no-input
+      - name: nginx
+        run: docker compose -f docker-compose.nginx.yml down -v
+      - name: nginx
+        run: docker compose -f docker-compose.nginx.yml up -d --build
 
       - name: Clean up old docker resources
         run: |

.github/workflows/tests_be.yml

@@ -15,6 +15,8 @@ env:
   EMAIL_HOST_USER: [email protected]
   EMAIL_HOST_PASSWORD: Test1234
   CORS_ORIGIN_WHITELIST: ''
+  ALLOWED_ENV_HOST: ''
+
 
 jobs:
   build:

FrontEnd/Dockerfile

@@ -4,6 +4,12 @@ WORKDIR /app
 # Copy app files
 COPY . .
 # Install dependencies (npm ci makes sure the exact versions in the lockfile gets installed)
+ARG REACT_APP_BASE_API_URL
+ARG REACT_APP_PUBLIC_URL
+
+ENV REACT_APP_BASE_API_URL=$REACT_APP_BASE_API_URL
+ENV REACT_APP_PUBLIC_URL=$REACT_APP_PUBLIC_URL
+
 RUN npm ci 
 # Build the app
 RUN npm run build

configs/nginx/Dockerfile

@@ -1,4 +1,8 @@
-FROM nginx
-
-RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf /etc/nginx/conf.d
+FROM nginx:1.21.0-alpine as production
+ENV NODE_ENV production
+# Add your nginx.conf
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+# Expose port
+EXPOSE 80
+# Start nginx
+CMD ["nginx", "-g", "daemon off;"]

configs/nginx/nginx.conf

@@ -5,7 +5,7 @@ server {
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $host;
-        proxy_pass http://frontend:80;
+        proxy_pass http://frontend;
         proxy_redirect off;
     }
 

docker-compose.dev.yml

@@ -5,7 +5,7 @@ services:
     build: .
     container_name: api-dev
     restart: on-failure
-    command: gunicorn forum.wsgi:application --bind 0.0.0.0:8000
+    command: gunicorn --log-level debug forum.wsgi:application --bind 0.0.0.0:8000
     volumes:
       # - ./:/Forum
       - static:/home/forum/app/public/static
@@ -29,6 +29,7 @@ services:
       - EMAIL_HOST_USER=${EMAIL_HOST_USER}
       - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}
       - CORS_ORIGIN_WHITELIST=${CORS_ORIGIN_WHITELIST}
+      - ALLOWED_ENV_HOST=${ALLOWED_ENV_HOST}
     networks:
       - forum_network
   frontend:
@@ -37,6 +38,7 @@ services:
       - static:/home/forum/app/public/static
     environment:
       - REACT_APP_BASE_API_URL=${REACT_APP_BASE_API_URL}
+      - REACT_APP_PUBLIC_URL=${REACT_APP_PUBLIC_URL}
     ports:
       - 3000:80
     build:

docker-compose.nginx.yml

@@ -5,7 +5,7 @@ services:
     build: ./configs/nginx
     container_name: nginx
     ports:
-      - 8080:80
+      - 80:80
     networks:
       - forum_network
 networks:

forum/settings.py

@@ -28,8 +28,13 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
-# ALLOWED_HOSTS = ['localhost', '127.0.0.1', '[::1]', '0.0.0.0']
+ALLOWED_HOSTS = [
+    "localhost",
+    "127.0.0.1",
+    "[::1]",
+    "0.0.0.0",
+    config("ALLOWED_ENV_HOST"),
+]
 
 # Application definition
 
@@ -79,9 +84,6 @@
     "http://0.0.0.0",
 ]
 
-# For future:
-# CORS_ORIGIN_WHITELIST = os.getenv('CORS_ORIGIN_WHITELIST').split(',')
-
 CORS_ALLOW_HEADERS = list(default_headers) + [
     "Access-Control-Expose-Headers",
     "Access-Control-Allow-Headers",