diff --git a/.gitea/workflows/backend_build-deploy-prod.yaml b/.gitea/workflows/backend_build-deploy-prod.yaml index f9d079e..3dfb55a 100644 --- a/.gitea/workflows/backend_build-deploy-prod.yaml +++ b/.gitea/workflows/backend_build-deploy-prod.yaml @@ -8,7 +8,7 @@ name: Build and deploy the backend to production jobs: build-and-push: name: Build and push image - uses: ./workflow_build-image.yaml + uses: ./.gitea/workflows/workflow_build-image.yaml with: tag: stable secrets: @@ -16,8 +16,9 @@ jobs: deploy-prod: name: Deploy to production - uses: ./workflow_deploy-container.yaml + uses: ./.gitea/workflows/workflow_deploy-container.yaml with: - environment: prod + overlay: prod secrets: - PACKAGE_REGISTRY_ACCESS: ${{ secrets.KUBE_CONFIG }} + KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} + needs: build-and-push diff --git a/.gitea/workflows/backend_build-deploy-stg.yaml b/.gitea/workflows/backend_build-deploy-stg.yaml index 2cbb0f3..3d67c44 100644 --- a/.gitea/workflows/backend_build-deploy-stg.yaml +++ b/.gitea/workflows/backend_build-deploy-stg.yaml @@ -10,16 +10,17 @@ name: Build and deploy the backend to staging jobs: build-and-push: name: Build and push image - uses: ./workflow_build-image.yaml + uses: ./.gitea/workflows/workflow_build-image.yaml with: tag: unstable secrets: PACKAGE_REGISTRY_ACCESS: ${{ secrets.PACKAGE_REGISTRY_ACCESS }} deploy-prod: - name: Deploy to production - uses: ./workflow_deploy-container.yaml + name: Deploy to staging + uses: ./.gitea/workflows/workflow_deploy-container.yaml with: - environment: stg + overlay: stg secrets: - PACKAGE_REGISTRY_ACCESS: ${{ secrets.KUBE_CONFIG }} + KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} + needs: build-and-push diff --git a/.gitea/workflows/workflow_build-image.yaml b/.gitea/workflows/workflow_build-image.yaml index b33b03b..c04e6cf 100644 --- a/.gitea/workflows/workflow_build-image.yaml +++ b/.gitea/workflows/workflow_build-image.yaml @@ -34,5 +34,5 @@ jobs: uses: docker/build-push-action@v5 with: context: backend - tags: git.kluster.moll.re/anydev/anyway-backend:${{intputs.tag}} + tags: git.kluster.moll.re/anydev/anyway-backend:${{ inputs.tag }} push: true diff --git a/backend/README.md b/backend/README.md index a9fee94..1def675 100644 --- a/backend/README.md +++ b/backend/README.md @@ -9,8 +9,11 @@ This repository contains the backend code for the application. It utilizes FastA - Since the application is aimed to be deployed in a container, the `Dockerfile` is provided to build the image. ### Deployment -To deploy the backend docker container, we use kubernetes. The deployment configuration is located under [https://git.kluster.moll.re/anydev/deployment-backend/](https://git.kluster.moll.re/anydev/deployment-backend/). +To deploy the backend docker container, we use kubernetes. Modifications to the backend are automatically pushed to a two-stage environment through the CI pipeline. See [deployment/README](deployment/README.md] for further information. + +The deployment configuration is included as a submodule in the `deployment` directory. The standalone repository is under [https://git.kluster.moll.re/anydev/anyway-backend-deployment/](https://git.kluster.moll.re/anydev/anyway-backend-deployment/). ## Development -TBD \ No newline at end of file +TBD + diff --git a/backend/deployment b/backend/deployment index 2b8b839..8927f27 160000 --- a/backend/deployment +++ b/backend/deployment @@ -1 +1 @@ -Subproject commit 2b8b8390bcf22042ac9c164bab17a44c1291d4bc +Subproject commit 8927f278f32bf0eca169ce4b13fbde8a4ed57274