Merge pull request #848 from deNBI/staging

Staging
deNBI · Oct 19, 2021 · 65c62df · 65c62df
2 parents d1f0397 + 5686e8b
commit 65c62df
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 122 deletions.
diff --git a/.env.in b/.env.in
@@ -1,6 +1,7 @@
 # Client and Bibigrid
 CLOUD_PORTAL_CLIENT_TAG=0.1.0-beta.0.15.1
 BIBIGRID_TAG=bibigrid-rest-2.3
+FORC_API_KEY=
 
 CLIENT_PORT=
 OS_AUTH_URL=
@@ -11,9 +12,8 @@ OS_USER_DOMAIN_NAME=
 OS_PROJECT_DOMAIN_ID=
 OS_PASSWORD=
 
-
 # Filebeat
-FILEBEAT_TAG=7.14.1
+FILEBEAT_TAG=7.15.0
 ELASTIC_USER=
 ELASTIC_PASSWORD=
 HOST=portal-dev.denbi.de

diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
@@ -8,7 +8,7 @@ on:
       - 'dev'
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
 
       - name: Workflow run cleanup action

diff --git a/Dockerfile.update b/Dockerfile.update
@@ -1,3 +1,3 @@
 FROM denbicloud/cloud-portal-client:0.1.0-beta.0.15.1
 FROM bibiserv/bibigrid:bibigrid-rest-2.3
-FROM docker.elastic.co/beats/filebeat:7.14.1
+FROM docker.elastic.co/beats/filebeat:7.15.0
diff --git a/README.md b/README.md
@@ -35,7 +35,9 @@ fill in the missing parameters.
 When starting with commandline you will need to export some of them manually.
 
 #### Security Groups
-The client expects a security group with the name "defaultSimpleVM" to exist which will be assigned to each machine at startup. Also, each machine will have its own security group when it starts.
+The config file contains a name for the default SimpleVM security group. 
+It can be configured via the `default_simple_vm_security_group_name` key.
+The client will set this group for every SimpleVM machine.
 
 ##### Gateway
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - 'dev'
     jobs:
       build:
-        runs-on: self-hosted
+        runs-on: ubuntu-latest
         steps:
           - name: Workflow run cleanup action
@@ Expand Down @@