Skip to content

Commit

Permalink
6th iteration of CI/CD (#94)
Browse files Browse the repository at this point in the history
* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* added description to the video url field in project creation form issue #50 (#61)

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD (#75)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase 2 partial ------ 3 (#73)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch

* made deploy_frontend.sh more explanatory

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch (#77)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch

* made deploy_frontend.sh more explanatory

* Code Refactor (#67)

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* Issue #54: switched from class based views to function based views, moved styles to seprate files and changed the general structure of the project to be more intuitive

* more refactoring

* more refactor -- added new prettier rules and prettified more files not being covered by prettier initially

* Customized form submission error (#80)

* fixed issue #25 --- initial

* prettified

* fixed issue #34: Increased upload image size, added image compression and functionality to remove image metadata (#79)

* Removed line behind dob field label on the signup page (#81)

* fixed issue #26: removed line behind DOB input label

* fixed issue #26: removed line behind DOB field text in signup --- patch

* fixed issue #52: Added help text to project creation desc field (#82)

* fixed issue #59: Added projects, followers and following links to profile dropdown menu (#86)

* added functionality to show creators we are following (#83)

* added functionality to show creators we are following

* fixed issue #58: added functionality to show creators we are following --- patch

* ci/cd ---- test 1

* First Iteration of CI/CD workflow (#89)

* Added more actions to profile dropdown (#84)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD (#75)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase 2 partial ------ 3 (#73)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch (#77)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch

* made deploy_frontend.sh more explanatory

* Code Refactor (#67)

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* Issue #54: switched from class based views to function based views, moved styles to seprate files and changed the general structure of the project to be more intuitive

* more refactoring

* more refactor -- added new prettier rules and prettified more files not being covered by prettier initially

* Customized form submission error (#80)

* fixed issue #25 --- initial

* prettified

* fixed issue #34: Increased upload image size, added image compression and functionality to remove image metadata (#79)

* Removed line behind dob field label on the signup page (#81)

* fixed issue #26: removed line behind DOB input label

* fixed issue #26: removed line behind DOB field text in signup --- patch

* fixed issue #52: Added help text to project creation desc field (#82)

* fixed issue #59: Added projects, followers and following links to profile dropdown menu

* Revert "Added more actions to profile dropdown (#84)" (#85)

This reverts commit 271408a.

* ci/cd ---- test 1

* ci/cd ---- test 2

* Second Iteration of CI/CD (#90)

* Added more actions to profile dropdown (#84)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD (#75)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase 2 partial ------ 3 (#73)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch (#77)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch

* made deploy_frontend.sh more explanatory

* Code Refactor (#67)

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* Issue #54: switched from class based views to function based views, moved styles to seprate files and changed the general structure of the project to be more intuitive

* more refactoring

* more refactor -- added new prettier rules and prettified more files not being covered by prettier initially

* Customized form submission error (#80)

* fixed issue #25 --- initial

* prettified

* fixed issue #34: Increased upload image size, added image compression and functionality to remove image metadata (#79)

* Removed line behind dob field label on the signup page (#81)

* fixed issue #26: removed line behind DOB input label

* fixed issue #26: removed line behind DOB field text in signup --- patch

* fixed issue #52: Added help text to project creation desc field (#82)

* fixed issue #59: Added projects, followers and following links to profile dropdown menu

* Revert "Added more actions to profile dropdown (#84)" (#85)

This reverts commit 271408a.

* ci/cd ---- test 1

* ci/cd ---- test 2

* ci/cd ---- test 3

* third iteration of CI/CD (#91)

* Added more actions to profile dropdown (#84)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD (#75)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* phase 2 partial ------ 3 (#73)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed bug that occurs when user submit google drive video link (#72)

* added functionality to format youtube video url to embedable format

* made video url optional

* switched image upload location from cloudinary to digital ocean spaces

* added functionality to automatically delete image from digitalocean space once image is deleted from db

* added image count indicator and made video optional. also added project create button to navbar

* removed .ssl from git

* untracked .ssl-data

* added support for various forms of youtube video url, vimeo and google drive

* fixed issues #35, #33, #32, #30, #29

* fixed issue #46

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* fixed issue #68

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch (#77)

* domain setup step 1 test 5

* domain setup step 2(backend) test 1

* domain setup step2(backend) test2

* removed .ssl-data from .dockerignore

* added custom nginx container to handle reverse proxying and https requests

* made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling

* switched handling of ssl back to valian/docker-nginx-auto-ssl

* separated docker-compose files into dev and prod in preparation for CI/CD

* separated docker-compose files into dev and prod in preparation for CI/CD -- backend

* separated docker-compose files into dev and prod in preparation for CI/CD --- patch

* made deploy_frontend.sh more explanatory

* Code Refactor (#67)

* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* Issue #54: switched from class based views to function based views, moved styles to seprate files and changed the general structure of the project to be more intuitive

* more refactoring

* more refactor -- added new prettier rules and prettified more files not being covered by prettier initially

* Customized form submission error (#80)

* fixed issue #25 --- initial

* prettified

* fixed issue #34: Increased upload image size, added image compression and functionality to remove image metadata (#79)

* Removed line behind dob field label on the signup page (#81)

* fixed issue #26: removed line behind DOB input label

* fixed issue #26: removed line behind DOB field text in signup --- patch

* fixed issue #52: Added help text to project creation desc field (#82)

* fixed issue #59: Added projects, followers and following links to profile dropdown menu

* Revert "Added more actions to profile dropdown (#84)" (#85)

This reverts commit 271408a.

* ci/cd ---- test 1

* ci/cd ---- test 2

* ci/cd ---- test 3

* Update build_deploy_backend.yml

manually added manual workflow dispatch to github actions file

* ci/cd ---- test 5 ---- patch

* ci/cd ---- test 6
  • Loading branch information
NdibeRaymond authored Jan 26, 2021
1 parent 4a4f55c commit 3dd937b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
6 changes: 4 additions & 2 deletions zubhub_backend/deploy_backend.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#! /bin/bash

echo "copying .env file and ssl folder"
echo "copying important files and folders from old project to new project"
mv /home/zubhub-backend/zubhub_backend/.env /home/zubhub-backend/zubhub/zubhub_backend/.env
echo "done copying .env file and ssl folder"
cp -r /home/zubhub-backend/zubhub_backend/zubhub/creators/migrations/ /home/zubhub-backend/zubhub/zubhub_backend/zubhub/creators/migrations/
cp -r /home/zubhub-backend/zubhub_backend/zubhub/projects/migrations/ /home/zubhub-backend/zubhub/zubhub_backend/zubhub/projects/migrations/
echo "copying important files and folders from old project to new project"

echo "removing old project folder"
rm -rf /home/zubhub-backend/zubhub_backend
Expand Down
22 changes: 11 additions & 11 deletions zubhub_backend/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: "3.3"

services:
web:
container_name: web
image: unstructuredstudio/zubhub-backend:latest
env_file: .env
command: /start
Expand All @@ -24,8 +25,9 @@ services:
- rabbitmq

db:
env_file: .env
container_name: db
image: postgres:11
env_file: .env
restart: on-failure
environment:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
Expand Down Expand Up @@ -57,19 +59,18 @@ services:
- prometheus

rabbitmq:
env_file: .env
container_name: rabbitmq
image: rabbitmq:3-management
restart: on-failure
env_file: .env
restart: always
ports:
- 5672
- 15672

celery_worker:
container_name: celery_worker
image: unstructuredstudio/zubhub-backend:latest
env_file: .env
build:
context: .
dockerfile: ./Dockerfile
image: zubhub_celery_worker
command: /start-celeryworker
restart: on-failure
volumes:
Expand All @@ -79,11 +80,9 @@ services:
- db

flower:
container_name: flower
image: unstructuredstudio/zubhub-backend:latest
env_file: .env
build:
context: .
dockerfile: ./Dockerfile
image: zubhub_celery_flower
ports:
- 5555
command: /start-flower
Expand All @@ -96,6 +95,7 @@ services:
- db

prometheus:
container_name: prometheus
image: prom/prometheus
ports:
- 9090
Expand Down
8 changes: 6 additions & 2 deletions zubhub_backend/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ version: "3.3"

services:
web:
container_name: web
env_file: .env
build:
context: .
Expand All @@ -26,6 +27,7 @@ services:
- rabbitmq

db:
container_name: db
env_file: .env
image: postgres:11
restart: on-failure
Expand All @@ -37,6 +39,7 @@ services:
- 5432:5432

rabbitmq:
container_name: rabbitmq
env_file: .env
image: rabbitmq:3-management
restart: on-failure
Expand All @@ -45,11 +48,11 @@ services:
- 15672:15672

celery_worker:
container_name: celery_worker
env_file: .env
build:
context: .
dockerfile: ./Dockerfile
image: zubhub_celery_worker
command: /start-celeryworker
restart: on-failure
volumes:
Expand All @@ -59,11 +62,11 @@ services:
- db

flower:
container_name: flower
env_file: .env
build:
context: .
dockerfile: ./Dockerfile
image: zubhub_celery_flower
ports:
- 5555:5555
command: /start-flower
Expand All @@ -76,6 +79,7 @@ services:
- db

prometheus:
container_name: prometheus
image: prom/prometheus
ports:
- 9090:9090
Expand Down
3 changes: 2 additions & 1 deletion zubhub_frontend/zubhub/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ version: '3.3'

services:
zubhub_frontend:
image: unstructuredstudio/zubhub-frontend:latest
container_name: zubhub_frontend
image: unstructuredstudio/zubhub-frontend:latest
env_file: .env
volumes:
- ./nginx/prod/default.conf:/etc/nginx/conf.d/default.conf
restart: on-failure
Expand Down
1 change: 1 addition & 0 deletions zubhub_frontend/zubhub/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ version: '3.3'
services:
zubhub_frontend:
container_name: zubhub_frontend
env_file: .env
build:
context: .
dockerfile: Dockerfile
Expand Down

0 comments on commit 3dd937b

Please sign in to comment.