Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup docker compose for workers #143

Merged
merged 50 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
327a173
Add initial/work-in-progress docker-compose
nathanfranklin Sep 14, 2023
24fac06
Add nginx conf
nathanfranklin Sep 14, 2023
6910758
Move docker infrastructure to devops folder
nathanfranklin Sep 14, 2023
443c96a
Move remaining docker infrastructure to devops folder
nathanfranklin Sep 14, 2023
b15b0fc
Fix local development's docker-compose
nathanfranklin Sep 14, 2023
49774e1
Add additional improvements to docker-compose for geoapi-services vms
nathanfranklin Sep 14, 2023
466400e
Add some variables
nathanfranklin Sep 18, 2023
37486df
Use one env variable for mapillary
nathanfranklin Sep 19, 2023
ee47a45
Fix dockerfiles
nathanfranklin Sep 20, 2023
aa112f8
Add secret.env to gitignore
nathanfranklin Sep 20, 2023
33b6799
Update docker-compose test yaml
nathanfranklin Sep 20, 2023
4b5a557
Fix installing of python packages on github actions workflow
nathanfranklin Sep 20, 2023
d3ff8b3
Change to devops/ before running test on CI workflow
nathanfranklin Sep 20, 2023
cf069c6
Simplify install/pytest step in CI workflow
nathanfranklin Sep 20, 2023
d397f14
Refactor location of dockerfiles and images used
nathanfranklin Sep 21, 2023
f6ba45e
Fix nginx conf for deployment
nathanfranklin Sep 21, 2023
aca6a94
Change secrets location to /opt/portal/conf/secret.env
nathanfranklin Sep 22, 2023
0d05626
Use absolute path for secrets.env
nathanfranklin Sep 22, 2023
00669c4
Add makefile for geoapi-services
nathanfranklin Sep 22, 2023
e8d3447
Refactor dockerfile
nathanfranklin Sep 22, 2023
16e34d7
Correct path to poetry.lock and pyproject.toml
nathanfranklin Sep 22, 2023
10ccc52
Fix paths in dockerfile
nathanfranklin Sep 22, 2023
107b950
Rename Dockerfile.potree to Dockerfile.worker
nathanfranklin Sep 22, 2023
0ba35b9
Rename Dockerfile.potree to Dockerfile.worker again
nathanfranklin Sep 22, 2023
7289734
Fix workflow
nathanfranklin Sep 26, 2023
2457296
Fix workflow
nathanfranklin Sep 26, 2023
e0aebdc
Remove env file usage in Makefile
nathanfranklin Sep 26, 2023
a77c811
Pass in GEOAPI_TAG from env
nathanfranklin Sep 26, 2023
dbaa93a
Remove echo
nathanfranklin Sep 26, 2023
8549c82
Fix docker compose statement
nathanfranklin Sep 26, 2023
a7b41de
update docker compose and Makefile
nathanfranklin Sep 26, 2023
9445199
Fix MAKEFILE
nathanfranklin Sep 26, 2023
e30f69d
Add todo
nathanfranklin Sep 26, 2023
d041516
Fix MAKEFILE again
nathanfranklin Sep 26, 2023
7424b82
Add missing RABBITMQ_VHOST
nathanfranklin Sep 26, 2023
fb422f7
Do not run docker up in background for testing
nathanfranklin Sep 26, 2023
69efa06
Fix gitignore and improve dockerignore
nathanfranklin Sep 28, 2023
68b2f28
Bump rabbitmq version
nathanfranklin Sep 28, 2023
3a0d55c
Update todo
nathanfranklin Sep 28, 2023
e86673a
Fix tabbitmq password variable on example secrets file
nathanfranklin Sep 28, 2023
2f094b8
Refactor how settings are set based on APP_ENV
nathanfranklin Sep 28, 2023
f05f5c3
Add hazmapper to docker-compose
nathanfranklin Sep 28, 2023
4ebf185
Fix makefile
nathanfranklin Sep 28, 2023
e536f4b
Expose rabbitmq port from geoapi-services
nathanfranklin Sep 28, 2023
8f1314f
Setup docker compose for workers
sophia-massie Sep 28, 2023
11cb1e5
Edit name of worker docker compose
sophia-massie Sep 28, 2023
0840e27
Changed name for docker compose
sophia-massie Sep 28, 2023
1c323df
Removed unused network for workers
sophia-massie Sep 28, 2023
cd1c3e3
Change api port to 8000
sophia-massie Sep 28, 2023
afdedf6
Merge branch 'master' of github.com:TACC-Cloud/geoapi into task/wg-14…
sophia-massie Sep 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions devops/geoapi-workers/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.PHONY: start
start:
echo "starting (GEOAPI_TAG=${GEOAPI_TAG})"
docker compose -f docker-compose.yml up -d

.PHONY: stop
stop:
docker compose -f docker-compose.yml down

.PHONY: pull
pull:
docker compose pull workers
17 changes: 17 additions & 0 deletions devops/geoapi-workers/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
version: "3"
services:
workers:
image: taccaci/geoapi-workers:${GEOAPI_TAG}
volumes:
- /assets:/assets
env_file: /opt/portal/conf/secrets.env
environment:
- FLASK_APP=/app/geoapi/app.py
- ASSETS_BASE_DIR=/assets
- GEOAPI_TAG=ENV_GEOAPI_TAG
stdin_open: true
tty: true
container_name: geoapiworkers
hostname: geoapiworkers
command: "celery -A geoapi.celery_app worker -l info"