Merge pull request #12 from opexdev/release-v1.0.0-beta.4

Release v1.0.0-beta.4

.github/workflows/dev.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Trigger jenkins job
         uses: appleboy/jenkins-action@master
         with:
-          url: ${{ secrets.JENKINS_URL }}
-          user: ${{ secrets.JENKINS_USER }}
-          token: ${{ secrets.JENKINS_TOKEN }}
+          url: ${{ secrets.JENKINS_DEV_URL }}
+          user: ${{ secrets.JENKINS_DEV_USER }}
+          token: ${{ secrets.JENKINS_DEV_TOKEN }}
           job: "opex-dev"

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Trigger jenkins job
         uses: appleboy/jenkins-action@master
         with:
-          url: ${{ secrets.JENKINS_URL }}
-          user: ${{ secrets.JENKINS_USER }}
-          token: ${{ secrets.JENKINS_TOKEN }}
-          job: "demo-opex"
+          url: ${{ secrets.JENKINS_DEMO_URL }}
+          user: ${{ secrets.JENKINS_DEMO_USER }}
+          token: ${{ secrets.JENKINS_DEMO_TOKEN }}
+          job: "opex-demo"

docker-stack.backup.yml

@@ -78,8 +78,6 @@ services:
     <<: *backup-service
     volumes:
       - api-backup:/backups
-    networks:
-      - default
     environment:
       - POSTGRES_HOST=${POSTGRES_HOST:-postgres-api}
       - POSTGRES_DB=opex

docker-stack.demo.yml

@@ -6,6 +6,3 @@ services:
   consul:
     ports:
       - "8500:8500"
-  nginx:
-    ports:
-      - "443:443"

docker-stack.dev.yml

@@ -6,6 +6,3 @@ services:
   consul:
     ports:
       - "8501:8500"
-  nginx:
-    ports:
-      - "8443:443"

docker-stack.reverse-proxy.yml

@@ -2,11 +2,20 @@ version: '3.8'
 services:
   nginx:
     image: ghcr.io/opexdev/nginx:$TAG
+    environment:
+      - EXPOSED_PORT=$EXPOSED_PORT
+      - SERVER_NAME_DASHBOARD=$SERVER_NAME_DASHBOARD
+      - SERVER_NAME_ADMIN_PANEL=$SERVER_NAME_ADMIN_PANEL
+      - SERVER_NAME_WEB_APP=$SERVER_NAME_WEB_APP
+      - SERVER_NAME_AUTH=$SERVER_NAME_AUTH
+      - SERVER_NAME_API=$SERVER_NAME_API
     volumes:
       - www:/data/www
     secrets:
       - opex_dev_crt
       - private_pem
+    ports:
+      - "$EXPOSED_PORT:443"
     networks:
       - default
     depends_on:
@@ -23,4 +32,4 @@ services:
       restart_policy:
         condition: on-failure
 volumes:
-  www:
+  www:

docker-stack.yml

@@ -195,6 +195,7 @@ services:
     image: ghcr.io/opexdev/accountant:$TAG
     environment:
       - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+      - SPRING_PROFILES_ACTIVE=scheduled
       - KAFKA_IP_PORT=kafka-1:29092,kafka-2:29092,kafka-3:29092
       - CONSUL_HOST=consul
       - DB_IP_PORT=postgres-accountant