From d51acfd7990c8fe7b95fe2d23f7a379540b867cb Mon Sep 17 00:00:00 2001 From: FerranAD Date: Wed, 11 Oct 2023 17:29:00 +0200 Subject: [PATCH] ci: add frontend to docker compose Co-authored-by: oriolagobat Co-authored-by: Pablito2020 --- .github/workflows/deploy.yml | 2 +- docker-compose.yml | 22 +++++++--------------- refuapp-backend | 2 +- refuapp-frontend | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 698da0e..e698a12 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,4 +42,4 @@ jobs: port: 22 script: | cd ${{ secrets.PATH_TO_SAVE }} - docker-compose pull && docker-compose up -d + docker-compose pull && docker-compose up -d --build diff --git a/docker-compose.yml b/docker-compose.yml index 07c133c..7f33daf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,13 @@ services: depends_on: - postgres + refuapp-frontend: + build: + context: ./refuapp-frontend # Path to your project directory + dockerfile: Dockerfile + depends_on: + - refuapp-backend + nginxproxymanager: image: 'jc21/nginx-proxy-manager:latest' container_name: nginxproxymanager @@ -40,18 +47,3 @@ volumes: type: none device: /home/ferran/data o: bind - frontend_page: - driver: local - driver_opts: - type: none - device: /home/ferran/web - static_files: - driver: local - driver_opts: - type: none - device: /home/ferran/static - swag_config_files: - driver: local - driver_opts: - type: none - device: /home/ferran/refuapp-deploy diff --git a/refuapp-backend b/refuapp-backend index d68794c..5025ccb 160000 --- a/refuapp-backend +++ b/refuapp-backend @@ -1 +1 @@ -Subproject commit d68794c3d7a98102d56f4ed3c766d81b8524ff3d +Subproject commit 5025ccbedeb142c73cdba14838ece7b1bc750bf0 diff --git a/refuapp-frontend b/refuapp-frontend index 862f2c4..43fe02a 160000 --- a/refuapp-frontend +++ b/refuapp-frontend @@ -1 +1 @@ -Subproject commit 862f2c4bd33afe5c3210ca0cbf101c396daac363 +Subproject commit 43fe02afe5a425dd22797ab26cdefc9ee8f923b0