Revize 5b73f460

Deployment changes
re #9333

backend/docker-compose.yml

@@ -17 +17 @@
 
 
   app: # Spring boot application
-    build: .
+    build: ./backend
     container_name: app-backend  # name of the container
-    image: schwobik/backend-app:1.0
+    image: schwobik/backend-app:1.1
     ports:
       - "8080:8080"                 # expose port 8080 out of the docker container do the local machine
     depends_on:
@@ -29 +29 @@
 
   frontend:
     # Since our Dockerfile for web-server is located in react-app foler, our build context is ./react-app
-    build: ../frontend
+    build: ./frontend
     container_name: frontend
-    image: schwobik/frontend-app:1.0
+    image: schwobik/frontend-app:1.1
     ports:
-      - "80:80"
+      - "3000:3000"
+
+  nginx:
+    image: schwobik/nginx:1.1
+    depends_on:
+      - app
+      - frontend
+    restart: always
+    build: ./nginx
+    ports:
+      - "3050:80"
 
 volumes:
   db-data:

deployments/app-deployment.yaml

@@ +1 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: app
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        component: app
+    spec:
+      containers:
+        - env:
+            - name: SPRING_DATASOURCE_URL
+              value: jdbc:postgresql://db-service:5432/test
+          image: schwobik/backend-app:1.1
+          name: app
+          ports:
+            - containerPort: 8080
+          resources: {}
+      restartPolicy: Always
+status: {}

deployments/app-service.yaml

@@ +1 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: app-service
+spec:
+  type: ClusterIP
+  ports:
+    - name: "8080"
+      port: 8080
+      targetPort: 8080
+  selector:
+    component: app

deployments/db-deployment.yaml

@@ +1 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: db
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        component: db
+    spec:
+      containers:
+        - env:
+            - name: POSTGRES_DB
+              value: test
+            - name: POSTGRES_PASSWORD
+              value: Password.123
+            - name: POSTGRES_USER
+              value: test
+          image: postgres:14.2
+          name: postgres-db
+          ports:
+            - containerPort: 5432
+          resources: {}
+      restartPolicy: Always
+status: {}

deployments/db-service.yaml

@@ +1 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: db-service
+spec:
+  type: ClusterIP
+  ports:
+    - name: "5432"
+      port: 5432
+      targetPort: 5432
+  selector:
+    component: db

deployments/frontend-deployment.yaml

@@ +1 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: frontend-deployment
+spec:
+  replikas: 1
+  selector:
+    matchLabels:
+      component: app
+  template:
+    metadata:
+      labels:
+        component: app
+    spec:
+      containers:
+        - name: frontend
+          image: schwobik/frontend-app:1.1.1
+          ports:
+            - containerPort: 3000

deployments/frontend-service.yaml

@@ +1 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend-service
+spec:
+  type: LoadBalancer
+  ports:
+    - name: "3000"
+      port: 3000
+      targetPort: 3000
+  selector:
+    component: frontend

deployments/nginx-service.yaml

@@ +1 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ingress-service
+  anotation:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+spec:
+  rules:
+    - http:
+        paths:
+          - path: /?(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: frontend-service
+                port:
+                  number: 3000
+          - path: /api/?(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: app-service
+                port:
+                  number: 8080

frontend/Dockerfile

@@ -31 +31 @@
 COPY nginx/nginx.conf /etc/nginx/conf.d
 
 # Expose port 80 for HTTP Traffic
-EXPOSE 80
+EXPOSE 3000
 
 # start the nginx web server
 CMD ["nginx", "-g", "daemon off;"]

frontend/nginx/nginx.conf

@@ -1 @@
-server {
-    listen 80;
-
-    root   /usr/share/nginx/html;
+server{
+    listen 3000;
 
     location / {
-        index  index.html index.htm;
+        root /usr/share/nginx/html;
+        index index.html index.htm;
         try_files $uri $uri/ /index.html;
     }
-
-    location /api/ {
-        proxy_pass http://app-backend:8080/api/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-    }
 }

nginx/Dockerfile

@@ +1 @@
+FROM nginx
+COPY ./default.conf /etc/nginx/conf.d/default.conf

nginx/Dockerfile.dev

@@ -1 @@
-FROM nginx
-COPY ./default.conf /etc/nginx/conf.d/default.conf

nginx/default.conf

@@ -1 @@
-upstream client {
-    server client:3000;
+upstream frontend {
+    server frontend:3000;
 }
 
 upstream api {
@@ -10 +10 @@
     listen 80;
 
     location / {
-        proxy_pass http://client;
+        proxy_pass http://frontend;
     }
 
     location /sockjs-node {