move redis into goma-server

This commit is contained in:
uazo 2021-08-01 19:05:27 +02:00 committed by GitHub
parent 4c6eb4718e
commit 5bc12295a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -138,22 +138,12 @@ jobs:
needs: check_images needs: check_images
if: success() if: success()
services: services:
redis:
image: redis
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
env:
REMOVEDOCKERSUPPORT: true
USELOCALIMAGE: true
gomaserver: gomaserver:
image: uazo/goma-server image: uazo/goma-server
volumes: volumes:
- /tmp/proxy:/tmp/proxy - /tmp/proxy:/tmp/proxy
- /redis:/var/lib/redis
options: >- options: >-
--health-cmd "hostname -I >/tmp/proxy/gomaserverip" --health-cmd "hostname -I >/tmp/proxy/gomaserverip"
--health-interval 30s --health-interval 30s
@ -161,7 +151,6 @@ jobs:
--health-retries 5 --health-retries 5
env: env:
REDISHOST: redis
REMOVEDOCKERSUPPORT: true REMOVEDOCKERSUPPORT: true
USELOCALIMAGE: true USELOCALIMAGE: true
@ -200,6 +189,10 @@ jobs:
sudo chmod 777 $ARTIFACS_DIR sudo chmod 777 $ARTIFACS_DIR
rm -rf $ARTIFACS_DIR/* rm -rf $ARTIFACS_DIR/*
# update hosts
#sudo echo "$(cat /tmp/proxy/gomaserverip | xargs) gomaserver" >/etc/hosts
#sudo echo "$(cat /tmp/proxy/redisip | xargs) redis" >/etc/hosts
# set goma options # set goma options
export SERVER_HOST_GOMA=$(cat /tmp/proxy/gomaserverip | xargs) export SERVER_HOST_GOMA=$(cat /tmp/proxy/gomaserverip | xargs)
export GOMA_SERVER_HOST=$SERVER_HOST_GOMA export GOMA_SERVER_HOST=$SERVER_HOST_GOMA