Merge pull request #154 from almahmoud/update-container

Update requirements and add container building GHA

Author: nuwang

.github/workflows/build_container.yaml

@@ -0,0 +1,24 @@
+name: Build Image
+on:
+  workflow_dispatch: {}
+  push:
+    branches:
+      - 'master'
+jobs:
+  build:
+    name: Build image
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - run: docker build . -t galaxy/cloudman-server:latest
+      - name: Login to docker hub
+        uses: actions-hub/docker/login@master
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Push to docker hub
+        uses: actions-hub/docker@master
+        with:
+          args: push galaxy/cloudman-server:latest

cloudman/cloudman/settings.py

@@ -96,7 +96,7 @@
     import yaml
     with open(CM_GLOBAL_CONTEXT_PATH) as f:
         print(f"Loading cloudman global context from: {CM_GLOBAL_CONTEXT_PATH}")
-        CM_GLOBAL_CONTEXT = yaml.load(f)
+        CM_GLOBAL_CONTEXT = yaml.safe_load(f)
 else:
     CM_GLOBAL_CONTEXT = {}
 

requirements.txt

@@ -10,7 +10,7 @@ pydevd>=1.0.0
 # jinja2 for rendering install templates
 jinja2
 # get latest package versions for now
-git+https://github.com/CloudVE/cloudbridge
+git+https://github.com/CloudVE/cloudbridge#egg=cloudbridge[full]
 git+https://github.com/CloudVE/djcloudbridge
 # Leave cloudlaunch-cli before cloudlaunch-server due to coreapi version mismatch
 git+https://github.com/CloudVE/cloudlaunch-cli