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

Update gitpod to cache_from docker.cdot.systems #3371

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 1 addition & 13 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
FROM gitpod/workspace-base

# Installing Node LTS
# https://github.com/nvm-sh/nvm#installing-and-updating
USER gitpod
RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
&& bash -c ". .nvm/nvm.sh \
&& nvm install --lts \
&& nvm alias default lts/*"
FROM gitpod/workspace-node

# Installing docker
# https://docs.docker.com/engine/install/ubuntu/
Expand All @@ -18,7 +10,3 @@ RUN curl -o /var/lib/apt/dazzle-marks/docker.gpg -fsSL https://download.docker.c

RUN curl -o /usr/bin/slirp4netns -fsSL https://github.com/rootless-containers/slirp4netns/releases/download/v1.1.12/slirp4netns-$(uname -m) \
&& chmod +x /usr/bin/slirp4netns

RUN curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64 \
&& chmod +x /usr/local/bin/docker-compose

98 changes: 94 additions & 4 deletions docker/gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,28 @@ 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:
- '8000:8000'
restart: unless-stopped

traefik:
command:
Expand All @@ -28,6 +46,7 @@ services:
- '8443:80'
# The Web UI (enabled by --api.insecure=true)
- '8080:8080'
restart: unless-stopped

# SSO Identity Provider test service, https://simplesamlphp.org
# Access to the login page available at http://localhost:8081
Expand Down Expand Up @@ -58,21 +77,92 @@ services:
redis:
ports:
- '6379:6379'
restart: unless-stopped

elasticsearch:
ports:
- '9200:9200'
restart: unless-stopped

parser:
build:
context: ../src/api/parser
cache_from:
- docker.cdot.systems/parser:buildcache
depends_on:
- elasticsearch
- traefik
- redis
restart: unless-stopped

status:
build:
context: ../src/api/status
cache_from:
- docker.cdot.systems/status:buildcache
ports:
- '1111:1111'
environment:
- POSTS_URL=http://posts:5555
restart: unless-stopped

image:
build:
context: ../src/api/image
cache_from:
- docker.cdot.systems/image:buildcache
restart: unless-stopped

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
restart: unless-stopped

search:
build:
context: ../src/api/search
cache_from:
- docker.cdot.systems/search:buildcache
restart: unless-stopped

posts:
build:
context: ../src/api/posts
cache_from:
- docker.cdot.systems/posts:buildcache
restart: unless-stopped

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}
restart: unless-stopped

dependency-discovery:
build:
context: ../src/api/dependency-discovery
cache_from:
- docker.cdot.systems/dependency-discovery:buildcache
restart: unless-stopped