Merge pull request #3 from opexdev/dev

Release v1.0.0-beta.1
opexdev · May 21, 2022 · 89a3c66 · 89a3c66
2 parents ad2020f + 6eb6300
commit 89a3c66
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
                     sh 'cp -f $PREFERENCES_YML ./preferences.yml'
                 }
                 sh 'docker stack deploy -c docker-stack.yml -c docker-stack.override.yml demo-opex'
-                sh 'docker service update demo-opex_nginx -d'
+                sh 'docker service update demo-opex_nginx -d --force'
                 sh 'docker image prune -f'
                 sh 'docker network prune -f'
             }

diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
                     sh 'cp -f $PREFERENCES_YML ./preferences.yml'
                 }
                 sh 'docker stack deploy -c docker-stack.yml -c docker-stack.dev.yml dev-opex'
-                sh 'docker service update dev-opex_nginx -d'
+                sh 'docker service update dev-opex_nginx -d --force'
                 sh 'docker image prune -f'
                 sh 'docker network prune -f'
             }

diff --git a/docker-stack.dev.yml b/docker-stack.dev.yml
@@ -110,3 +110,5 @@ services:
       - "8443:443"
   web-app:
     image: ghcr.io/opexdev/web-app:dev
+  admin-panel:
+    image: ghcr.io/opexdev/admin-panel:dev
diff --git a/docker-stack.override.yml b/docker-stack.override.yml
@@ -123,3 +123,5 @@ services:
       - "443:443"
   web-app:
     image: ghcr.io/opexdev/web-app:latest
+  admin-panel:
+    image: ghcr.io/opexdev/admin-panel:latest
diff --git a/docker-stack.yml b/docker-stack.yml
@@ -816,6 +816,18 @@ services:
     deploy:
       restart_policy:
         condition: on-failure
+  admin-panel:
+    image: ghcr.io/opexdev/admin-panel
+    environment:
+      - API_BASE_URL=$API_BASE_URL
+      - FRONT_URL=$ADMIN_FRONT_URL
+      - CLIENT_ID=$ADMIN_CLIENT_ID
+      - CLIENT_SECRET=$ADMIN_CLIENT_SECRET
+    networks:
+      - default
+    deploy:
+      restart_policy:
+        condition: on-failure
 volumes:
   www:
   zookeeper-data: