demo commit

.gitea/workflows/prod.yaml

@@ -2,7 +2,8 @@ name: build-and-deploy-prod
 
 on:
   push:
-    - lab6
+    branches:
+      - master
   workflow_dispatch:
 
 jobs:
@@ -21,14 +22,14 @@ jobs:
           git init
           git remote add gitea http://10.1.1.1:3000/hasslesstech/devops-lab4
           git fetch gitea
-          git checkout origin/master
+          git checkout gitea/master
       - name: Build container
         shell: sh
         run: |
           docker build . -f Dockerfile-cc -t 10.5.1.10:5000/prod/cc
       - name: Push container
         shell: sh
-        run: \
+        run: |
           docker push 10.5.1.10:5000/prod/cc
 
   build-hm:
@@ -46,14 +47,14 @@ jobs:
           git init
           git remote add gitea http://10.1.1.1:3000/hasslesstech/devops-lab4
           git fetch gitea
-          git checkout origin/master
+          git checkout gitea/master
       - name: Build container
         shell: sh
         run: |
           docker build . -f Dockerfile-hm -t 10.5.1.10:5000/prod/hm
       - name: Push container
         shell: sh
-        run: \
+        run: |
           docker push 10.5.1.10:5000/prod/hm
 
   build-map:
@@ -71,14 +72,14 @@ jobs:
           git init
           git remote add gitea http://10.1.1.1:3000/hasslesstech/devops-lab4
           git fetch gitea
-          git checkout origin/master
+          git checkout gitea/master
       - name: Build container
         shell: sh
         run: |
           docker build . -f Dockerfile-map -t 10.5.1.10:5000/prod/map
       - name: Push container
         shell: sh
-        run: \
+        run: |
           docker push 10.5.1.10:5000/prod/map
   
   deploy-all:
@@ -89,8 +90,11 @@ jobs:
       - build-map
     steps:
       - run: |
-          ssh -i prod-key root@10.5.1.11 "sh -c 'git init &&
+          ssh -i ~/prod-key root@10.5.1.11 "sh -c 'rm -rf devops-lab4 ; git clone http://10.1.1.1:3000/hasslesstech/devops-lab4 && cd devops-lab4 &&
-                                          git remote add gitea http://10.1.1.1:3000/hasslesstech/devops-lab4 &&
+                                                   docker-compose -f docker-compose-prod.yaml up -d'"
-                                          git fetch gitea &&
+
-                                          git checkout -f origin/master &&
+
-                                          docker-compose up -d -f docker-compose-prod.yaml'"
+
+
+
+

Dockerfile

@@ -67,3 +67,6 @@ CMD sh -c "openrc default ; \
 	rc-service hive-hm start ; \
 	rc-service hive-map start ; \
 	exec sh"
+
+
+

docker-compose-dev.yaml

@@ -31,7 +31,7 @@ services:
     image: 10.5.1.10:5000/dev/map
     restart: always
     volumes:
-      - ./map/config.json:/usr/share/nginx/html/config.json:ro
+      - ./map/config-dev.json:/usr/share/nginx/html/config.json:ro
     ports:
       - 80:80
 

docker-compose-prod.yaml

@@ -31,7 +31,7 @@ services:
     image: 10.5.1.10:5000/prod/map
     restart: always
     volumes:
-      - ./map/config.json:/usr/share/nginx/html/config.json:ro
+      - ./map/config-prod.json:/usr/share/nginx/html/config.json:ro
     ports:
       - 80:80
 

map/config-dev.json

@@ -0,0 +1,3 @@
+{
+    "API": "http://10.5.1.12:8080/api/v1/client"
+}

map/config-prod.json

@@ -0,0 +1,3 @@
+{
+    "API": "http://10.5.1.11:8080/api/v1/client"
+}

map/config.json

@@ -1,3 +0,0 @@
-{
-    "API": "http://10.1.1.2:8080/api/v1/client"
-}