Skip to content

Ignores tasking manager front-end #42

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.

Sign up for GitHub

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

Merged
cyrossignol merged 1 commit into from
Sep 22, 2025
Merged

Ignores tasking manager front-end #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions docker-compose.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,23 +133,23 @@ services:
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${CODE_VERSION}

# tasking manager
tasks-frontend:
image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}
build:
cache_from:
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache
cache_to:
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache,mode=max
context: tasking-manager
dockerfile: ./scripts/docker/Dockerfile.frontend
args:
TM_APP_API_URL: ${WS_TASKS_URL}
#TM_CONSUMER_KEY
#TM_CONSUMER_SECRET

tasks-frontend_tag:
extends: tasks-frontend
image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}
# tasks-frontend:
# image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}
# build:
# cache_from:
# - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache
# cache_to:
# - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache,mode=max
# context: tasking-manager
# dockerfile: ./scripts/docker/Dockerfile.frontend
# args:
# TM_APP_API_URL: ${WS_TASKS_URL}
# #TM_CONSUMER_KEY
# #TM_CONSUMER_SECRET

# tasks-frontend_tag:
# extends: tasks-frontend
# image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}

# tasking manager
tasks-backend:
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@ services:
CGIMAP_MAP_AREA: ${WS_OSM_MAX_EXPORT_AREA}

# tasking manager (*not* Workspaces)
tasks-frontend:
image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${WS_DOCKER_TAG}
restart: always
labels:
- traefik.enable=true
- traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
- traefik.http.services.tasks-frontend.loadbalancer.server.port=80
- traefik.http.routers.tasks-frontend.entrypoints=websecure
- traefik.http.routers.tasks-frontend.tls.certresolver=myresolver
# tasks-frontend:
# image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${WS_DOCKER_TAG}
# restart: always
# labels:
# - traefik.enable=true
# - traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
# - traefik.http.services.tasks-frontend.loadbalancer.server.port=80
# - traefik.http.routers.tasks-frontend.entrypoints=websecure
# - traefik.http.routers.tasks-frontend.tls.certresolver=myresolver

tasks-backend:
image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${WS_DOCKER_TAG}
Expand Down
Loading