Task Manager files

Author: jeffmaki

docker-compose.build.yml

@@ -78,21 +78,29 @@ services:
     image: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${CODE_VERSION}
 
 
-#  tasks-frontend:
-#    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${WS_DOCKER_TAG}
-#    build:
-#      context: tasking-manager
-#      dockerfile: ./scripts/docker/Dockerfile.frontend
-#      args:
-#        TM_APP_API_URL: ${WS_TASKS_URL}
-#        #TM_CONSUMER_KEY
-#        #TM_CONSUMER_SECRET
-
-#  tasks-backend:
-#    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${WS_DOCKER_TAG}
-#    build:
-#      context: tasking-manager
-#      dockerfile: ./scripts/docker/Dockerfile.backend
-#      target: prod
-#      args:
-#        APP_UID: 1000
+  tasks-frontend:
+    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${WS_DOCKER_TAG}
+    build:
+      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-backend:
+    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${WS_DOCKER_TAG}
+    build:
+      context: tasking-manager
+      dockerfile: ./scripts/docker/Dockerfile.backend
+      target: prod
+      args:
+        APP_UID: 1000
+
+  tasks-backend_tag:
+    extends: tasks-backend
+    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${CODE_VERSION}

docker-compose.yml

@@ -153,32 +153,32 @@ services:
  #     - traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
  #     - traefik.http.services.tasks-frontend.loadbalancer.server.port=80
 
- # tasks-backend:
- #   build:
- #     context: tasking-manager
- #     dockerfile: ./scripts/docker/Dockerfile.backend
- #     target: debug
- #     args:
- #       APP_UID: 1000
- #   env_file: tasking-manager/tasking-manager.env
- #   environment:
- #     GEVENT_SUPPORT: true
- #   ports:
- #     - "5678:5678" # debugpy debugger port
- #   volumes:
- #     - ./tasking-manager:/usr/src/app
- #   labels:
- #     - traefik.enable=true
- #     - traefik.http.routers.tasks-backend.rule=Host(`${WS_TASKS_HOST}`) && PathPrefix(`/api/`)
- #     - traefik.http.routers.tasks-backend.service=tasks-backend
- #     - traefik.http.services.tasks-backend.loadbalancer.server.port=5000
- #     # Workspaces backend currently lives in the TM. Emulate a separate server for now:
- #     - traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.regex=^/api/v1/(.*)
- #     - traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.replacement=/api/v2/$$1/
- #     - traefik.http.routers.workspaces-backend.rule=Host(`${WS_API_HOST}`)
- #     - traefik.http.routers.workspaces-backend.service=workspaces-backend
- #     - traefik.http.services.workspaces-backend.loadbalancer.server.port=5000
- #     - traefik.http.routers.workspaces-backend.middlewares=workspaces-backend-emulation
+  tasks-backend:
+    build:
+      context: tasking-manager
+      dockerfile: ./scripts/docker/Dockerfile.backend
+      target: debug
+      args:
+        APP_UID: 1000
+    env_file: tasking-manager/tasking-manager.env
+    environment:
+      GEVENT_SUPPORT: true
+    ports:
+      - "5678:5678" # debugpy debugger port
+    volumes:
+      - ./tasking-manager:/usr/src/app
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.tasks-backend.rule=Host(`${WS_TASKS_HOST}`) && PathPrefix(`/api/`)
+      - traefik.http.routers.tasks-backend.service=tasks-backend
+      - traefik.http.services.tasks-backend.loadbalancer.server.port=5000
+      # Workspaces backend currently lives in the TM. Emulate a separate server for now:
+      - traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.regex=^/api/v1/(.*)
+      - traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.replacement=/api/v2/$$1/
+      - traefik.http.routers.workspaces-backend.rule=Host(`${WS_API_HOST}`)
+      - traefik.http.routers.workspaces-backend.service=workspaces-backend
+      - traefik.http.services.workspaces-backend.loadbalancer.server.port=5000
+      - traefik.http.routers.workspaces-backend.middlewares=workspaces-backend-emulation
 
 volumes:
   osm-rails-tmp: