From 8ce0e647b4d9138638297e3d6501fbfd4b5cff41 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Wed, 13 Jul 2022 10:27:47 +0100 Subject: [PATCH] draft gogs integration --- .env | 2 ++ docker-compose.yml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.env b/.env index 5038248..894c01c 100644 --- a/.env +++ b/.env @@ -18,3 +18,5 @@ IGN_PARTITION="movai_ce_flow" XAUTH=/tmp/.docker.xauth DISPLAY=${DISPLAY:-:1} LOGLEVEL=30 +GIT_POSTGRES_USER=gitmovai +GIT_POSTGRES_PASSWORD=gitmovai diff --git a/docker-compose.yml b/docker-compose.yml index 788f30f..78ef793 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -241,6 +241,36 @@ services: - | exec /usr/bin/rviz + gitserver: + image: gogs/gogs:latest + restart: always + ports: + - "30022:22" + - "30080:3000" + links: + - gitdb + environment: + - "RUN_CROND=true" + networks: + - private + - proxy + volumes: + - "gogs-data:/data" + depends_on: + - gitdb + + gitdb: + image: postgres:9.5 + restart: always + environment: + - "POSTGRES_USER=${GIT_POSTGRES_USER}" + - "POSTGRES_PASSWORD=${GIT_POSTGRES_PASSWORD}" + - "POSTGRES_DB=gogs" + volumes: + - "gitdb-data:/var/lib/postgresql/data" + networks: + - private + haproxy: image: haproxy:2.4.15 container_name: haproxy-$MOVAI_DEVICE_NAME @@ -260,6 +290,10 @@ services: volumes: redis-master-flow-volume: redis-local-flow-volume: + gitdb-data: + driver: local + gogs-data: + driver: local networks: proxy: