Revize 369e0228

Working deployment
re #9333

backend/app-deployment.yaml

@@ -2 +2 @@
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert
+    kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
     kompose.version: 1.26.0 (40646f47)
   creationTimestamp: null
   labels:
@@ -17 +17 @@
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert
+        kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
         kompose.version: 1.26.0 (40646f47)
       creationTimestamp: null
       labels:
@@ -27 +27 @@
         - env:
             - name: SPRING_DATASOURCE_URL
               value: jdbc:postgresql://db:5432/test
-          image: schwobik/backend-app:1.0
+          image: schwobik/backend-app:1.2
           name: app-backend
           ports:
             - containerPort: 8080

backend/app-service.yaml

@@ -2 +2 @@
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert
+    kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
     kompose.version: 1.26.0 (40646f47)
   creationTimestamp: null
   labels:

backend/db-data-persistentvolumeclaim.yaml

@@ -11 +11 @@
   resources:
     requests:
       storage: 100Mi
-status: { }
+status: {}

backend/db-deployment.yaml

@@ -2 +2 @@
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert
+    kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
     kompose.version: 1.26.0 (40646f47)
   creationTimestamp: null
   labels:
@@ -18 +18 @@
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert
+        kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
         kompose.version: 1.26.0 (40646f47)
       creationTimestamp: null
       labels:
@@ -36 +36 @@
           name: postgres-db
           ports:
             - containerPort: 5432
-          resources: { }
-          volumeMounts:
-            - mountPath: /var/lib/postgresql/data
-              name: db-data
+          resources: {}
       restartPolicy: Always
-      volumes:
-        - name: db-data
-          persistentVolumeClaim:
-            claimName: db-data
 status: {}

backend/db-service.yaml

@@ -2 +2 @@
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert
+    kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
     kompose.version: 1.26.0 (40646f47)
   creationTimestamp: null
   labels:
@@ -13 +13 @@
     - name: "5432"
       port: 5432
       targetPort: 5432
-    - name: 5432-tcp
-      port: 5432
-      targetPort: 5432
   selector:
     io.kompose.service: db
 status:

backend/docker-compose.yml

@@ -19 +19 @@
   app: # Spring boot application
     build: .
     container_name: app-backend  # name of the container
-    image: schwobik/backend-app:1.0
+    image: schwobik/backend-app:1.2
     ports:
       - "8080:8080"                 # expose port 8080 out of the docker container do the local machine
     depends_on:
@@ -31 +31 @@
     # Since our Dockerfile for web-server is located in react-app foler, our build context is ./react-app
     build: ../frontend
     container_name: frontend
-    image: schwobik/frontend-app:1.0
+    image: schwobik/frontend-app:1.2
     ports:
       - "80:80"
 

backend/frontend-deployment.yaml

@@ -2 +2 @@
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert
+    kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
     kompose.version: 1.26.0 (40646f47)
   creationTimestamp: null
   labels:
@@ -13 +13 @@
   selector:
     matchLabels:
       io.kompose.service: frontend
-  strategy: { }
+  strategy: {}
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert
+        kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
         kompose.version: 1.26.0 (40646f47)
       creationTimestamp: null
       labels:
         io.kompose.service: frontend
     spec:
       containers:
-        - image: schwobik/frontend-app:1.0
+        - image: schwobik/frontend-app:1.2
           name: frontend
           ports:
             - containerPort: 80
-          resources: { }
+          resources: {}
       restartPolicy: Always
-status: { }
+status: {}

backend/frontend-service.yaml

@@ -2 +2 @@
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert
+    kompose.cmd: D:\Skola\5_leto\ASWI\Semestralka\aswi2022code-of-duty\kompose.exe convert
     kompose.version: 1.26.0 (40646f47)
   creationTimestamp: null
   labels:
@@ -15 +15 @@
       targetPort: 80
   selector:
     io.kompose.service: frontend
+  type: LoadBalancer
 status:
-  loadBalancer: { }
+  loadBalancer: {}

frontend/.env

@@ -1 @@
-REACT_APP_API_BASE_URL=http://localhost:8080
+REACT_APP_API_BASE_URL=/api

frontend/nginx/nginx.conf

@@ +1 @@
+upstream app {
+    server app:8080;
+}
 server {
     listen 80;
 
@@ -8 +11 @@
         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;
+    location /api {
+        rewrite /api/(.*) /$1 break;
+        proxy_pass http://app;
     }
 }

frontend/requests/login.http

@@ -1 +1 @@
 POST /login
-Host: localhost:8080
+Host: /api
 Content-Type: application/json
 
 {

frontend/requests/register.http

@@ -1 +1 @@
 POST /register
-Host: localhost:8080
+Host: /api
 Content-Type: application/json
 
 

frontend/src/.env

@@ -1 @@
-REACT_APP_API_BASE_URL=http://localhost:8080/api
+REACT_APP_API_BASE_URL=/api

frontend/src/config/conf.ts

@@ -1 +1 @@
 const conf = {
-    baseUrl: 'http://localhost:8080'
+    baseUrl: '/api'
 }
 
 export default conf;

frontend/src/swagger/http-client.ts

@@ -54 +54 @@
 }
 
 export class HttpClient<SecurityDataType = unknown> {
-  public baseUrl: string = "http://localhost:8080";
+  public baseUrl: string = "/api";
   private securityData: SecurityDataType | null = null;
   private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
   private abortControllers = new Map<CancelToken, AbortController>();