From 6872ef52bd9e31d789add4844a41a0946e267676 Mon Sep 17 00:00:00 2001
From: TDDR <tim.roberts@mailfence.com>
Date: Thu, 31 Mar 2022 11:31:10 -0400
Subject: [PATCH] Update gitpod to cache_from docker.cdot.systems

---
 .gitpod.Dockerfile |  2 +-
 docker/gitpod.yml  | 86 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 0ddae96cd6..7feb4afb83 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,4 +1,4 @@
-FROM gitpod/workspace-base
+FROM gitpod/workspace-node
 
 # Installing Node LTS
 # https://github.com/nvm-sh/nvm#installing-and-updating
diff --git a/docker/gitpod.yml b/docker/gitpod.yml
index 2d7d971581..3395d5fefb 100644
--- a/docker/gitpod.yml
+++ b/docker/gitpod.yml
@@ -12,6 +12,23 @@ version: '3'
 services:
   # API Gateway
   nginx:
+    build:
+      context: ../src/web/app
+      cache_from:
+        - docker.cdot.systems/nginx:buildcache
+      # next.js needs build-time access to a number of API URL values, forward as ARGs
+      args:
+        # Web front-end URL
+        - WEB_URL=${WEB_URL}
+        # Telescope 1.0 API URL
+        - API_URL=${API_URL}
+        # Telescope 2.0 Microservice URLs
+        - IMAGE_URL=${IMAGE_URL}
+        - SSO_URL=${SSO_URL}
+        - POSTS_URL=${POSTS_URL}
+        - SEARCH_URL=${SEARCH_URL}
+        - FEED_DISCOVERY_URL=${FEED_DISCOVERY_URL}
+        - STATUS_URL=${STATUS_URL}
     volumes:
       - ../config/nginx.conf.development.template:/etc/nginx/nginx.conf
     ports:
@@ -63,16 +80,77 @@ services:
     ports:
       - '9200:9200'
 
+  parser:
+    build:
+      context: ../src/api/parser
+      cache_from:
+        - docker.cdot.systems/parser:buildcache
+    depends_on:
+      - elasticsearch
+      - traefik
+      - redis
+
+  status:
+    build:
+      context: ../src/api/status
+      cache_from:
+        - docker.cdot.systems/status:buildcache
+    ports:
+      - '1111:1111'
+    environment:
+      - POSTS_URL=http://posts:5555
+
+  image:
+    build:
+      context: ../src/api/image
+      cache_from:
+        - docker.cdot.systems/image:buildcache
+
   sso:
+    build:
+      context: ../src/api/sso
+      cache_from:
+        - docker.cdot.systems/sso:buildcache
+    environment:
+      # In development and testing, the SSO service needs to contact the Supabase
+      # service directly via Docker vs through the http://localhost/v1/supabase domain.
+      - SUPABASE_URL=http://kong:8000
     depends_on:
       - test-web-content
+      - traefik
+      - login
+
+  search:
+    build:
+      context: ../src/api/search
+      cache_from:
+        - docker.cdot.systems/search:buildcache
+
+  posts:
+    build:
+      context: ../src/api/posts
+      cache_from:
+        - docker.cdot.systems/posts:buildcache
 
   feed-discovery:
-    image: docker.cdot.systems/feed-discovery
+    build:
+      context: ../src/api/feed-discovery
+      cache_from:
+        - docker.cdot.systems/feed-discovery:buildcache
     restart: unless-stopped
 
-  parser:
+  planet:
     build:
-      context: ../src/api/parser
+      context: ../src/api/planet
       cache_from:
-        - docker.cdot.systems/parser:buildcache
+        - docker.cdot.systems/planet:buildcache
+    ports:
+      - '9876:9876'
+    environment:
+      - POSTS_URL=http://posts:${POSTS_PORT:-5555}
+
+  dependency-discovery:
+    build:
+      context: ../src/api/dependency-discovery
+      cache_from:
+        - docker.cdot.systems/dependency-discovery:buildcache