ECR images

Author: pokerface03

ansible/deploy.yml

@@ -99,7 +99,7 @@
 
     - name: Build and start application with Docker Compose
       become: no
-      command: docker compose -f docker-compose.yml up -d --build
+      command: docker compose -f docker-compose.yml up -d --build --remove-orphans
       args:
         chdir: "{{ app_dir }}"
 
@@ -109,6 +109,6 @@
 
     - name: Initialize Postgres table
       command: docker exec -i postgres psql -U postgres -d movies_db -f /tmp/init.sql
-      
+
 
 

docker-compose.yml

@@ -12,13 +12,24 @@
       networks:
         - movie-api-network
 
-    gateway-frontend:
-      image: 620914207029.dkr.ecr.eu-west-1.amazonaws.com/movie_api:gateway-frontend
-      container_name: gateway-frontend
+    frontend:
+      image: 620914207029.dkr.ecr.eu-west-1.amazonaws.com/movie_api:frontend
+      container_name: frontend
+      expose:
+        - "8082"
+      depends_on:
+        - movieAPI
+      networks:
+        - movie-api-network
+
+    gateway:
+      image: 620914207029.dkr.ecr.eu-west-1.amazonaws.com/movie_api:gateway
+      container_name: gateway
       ports:
         - "80:80"
       depends_on:
         - movieAPI
+        - frontend
       networks:
         - movie-api-network
 

frontend/Dockerfile

@@ -5,6 +5,6 @@ COPY script.js /usr/share/nginx/html
 COPY style.css /usr/share/nginx/html
 
 COPY nginx.conf /etc/nginx/conf.d/default.conf
-EXPOSE 80
+EXPOSE 8082
 
 CMD ["nginx", "-g", "daemon off;"]

frontend/nginx.conf

@@ -1,33 +1,10 @@
 server {
-    listen 80;
+    listen 8082;
     server_name _;
 
     root /usr/share/nginx/html;
     index index.html;
 
-    
-
-    location /movie/ {
-
-        add_header 'Access-Control-Allow-Origin' '*' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Authorization' always;
-
-        if ($request_method = OPTIONS) {
-            add_header 'Access-Control-Allow-Origin' '*';
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
-            add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Authorization';
-            add_header 'Content-Length' 0;
-            add_header 'Content-Type' text/plain;
-            return 204;
-        }
-        proxy_pass http://movieAPI:8000/;  # backend service inside Docker network
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
     location / {
         try_files $uri /index.html;
     }

gateway/Dockerfile

@@ -0,0 +1,6 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

gateway/nginx.conf

@@ -0,0 +1,49 @@
+server {
+    listen 80;
+    server_name _;
+
+
+
+    
+
+    location /movie/ {
+
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Authorization' always;
+
+        if ($request_method = OPTIONS) {
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Authorization';
+            add_header 'Content-Length' 0;
+            add_header 'Content-Type' text/plain;
+            return 204;
+        }
+        proxy_pass http://movieAPI:8000/;  # backend service inside Docker network
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location / {
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Authorization' always;
+
+        if ($request_method = OPTIONS) {
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Authorization';
+            add_header 'Content-Length' 0;
+            add_header 'Content-Type' text/plain;
+            return 204;
+        }
+        proxy_pass http://frontend:8082/;  # backend service inside Docker network
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}