refactor: move container out of guacamole subdir

SwanseaUniversityMedical · Mar 6, 2024 · 610f378 · 610f378
1 parent 2ae2524
commit 610f378
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/controller-container.yaml b/.github/workflows/controller-container.yaml
@@ -3,12 +3,12 @@ name: Controller Container
 on:
   pull_request:
     paths:
-      - 'containers/guacamole/controller/**'
+      - 'containers/controller/**'
   push:
     branches:
       - main
     paths:
-      - 'containers/guacamole/controller/**'
+      - 'containers/controller/**'
 
 permissions:
   contents: write
@@ -30,7 +30,8 @@ jobs:
       release-tag-format: 'controller-container-${version}'
       cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}
       slack-channel: ${{ vars.SLACK_CHANNEL }}
-      build-file: containers/guacamole/controller/Dockerfile
+      build-file: containers/controller/Dockerfile
+      build-context: containers/controller
     secrets:
       cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }}
       cosign-password: ${{ secrets.COSIGN_PASSWORD }}

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - '.flake8'
-      - 'containers/guacamole/controller/src/**.py'
+      - 'containers/controller/src/**.py'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -28,4 +28,4 @@ jobs:
 
       - name: run flake8
         run: |
-          flake8 containers/guacamole/controller/src
+          flake8 containers/controller/src
diff --git a/containers/guacamole/controller/Dockerfile → containers/controller/Dockerfile b/containers/guacamole/controller/Dockerfile → containers/controller/Dockerfile
diff --git a/.../guacamole/controller/src/api/__init__.py → containers/controller/src/api/__init__.py b/.../guacamole/controller/src/api/__init__.py → containers/controller/src/api/__init__.py
diff --git a/...e/controller/src/api/authenticate_user.py → ...s/controller/src/api/authenticate_user.py b/...e/controller/src/api/authenticate_user.py → ...s/controller/src/api/authenticate_user.py
diff --git a/...guacamole/controller/src/api/build_url.py → containers/controller/src/api/build_url.py b/...guacamole/controller/src/api/build_url.py → containers/controller/src/api/build_url.py
diff --git a/...rs/guacamole/controller/src/controller.py → containers/controller/src/controller.py b/...rs/guacamole/controller/src/controller.py → containers/controller/src/controller.py
diff --git a/...amole/controller/src/database/__init__.py → ...iners/controller/src/database/__init__.py b/...amole/controller/src/database/__init__.py → ...iners/controller/src/database/__init__.py
diff --git a/...ole/controller/src/database/connection.py → ...ers/controller/src/database/connection.py b/...ole/controller/src/database/connection.py → ...ers/controller/src/database/connection.py
diff --git a/...oller/src/database/create_service_user.py → ...oller/src/database/create_service_user.py b/...oller/src/database/create_service_user.py → ...oller/src/database/create_service_user.py
diff --git a/...mole/controller/src/directory/__init__.py → ...ners/controller/src/directory/__init__.py b/...mole/controller/src/directory/__init__.py → ...ners/controller/src/directory/__init__.py
diff --git a/...roller/src/directory/authenticate_user.py → ...roller/src/directory/authenticate_user.py b/...roller/src/directory/authenticate_user.py → ...roller/src/directory/authenticate_user.py
diff --git a/...oller/src/directory/iter_group_members.py → ...oller/src/directory/iter_group_members.py b/...oller/src/directory/iter_group_members.py → ...oller/src/directory/iter_group_members.py
diff --git a/...e/controller/src/directory/iter_search.py → ...s/controller/src/directory/iter_search.py b/...e/controller/src/directory/iter_search.py → ...s/controller/src/directory/iter_search.py
diff --git a/...guacamole/controller/src/requirements.txt → containers/controller/src/requirements.txt b/...guacamole/controller/src/requirements.txt → containers/controller/src/requirements.txt