diff --git a/scripts/docker-compose/common.env b/scripts/docker-compose/common.env index 86ca0e65e..75b6d466b 100755 --- a/scripts/docker-compose/common.env +++ b/scripts/docker-compose/common.env @@ -6,7 +6,7 @@ COMMON_JWT_REFRESH_SECRET="change_me_jwt_refresh" COMMON_S3_KEY="change_me_s3_key" COMMON_S3_SECRET="change_me_s3_secret" COMMON_PG_PASSWORD="change_me_pg_password" -COMMON_VERSION="v1.16.0" +COMMON_VERSION="v1.21.0" ## DB versions ###################################### POSTGRES_VERSION="14.5.0" diff --git a/scripts/docker-compose/docker-compose.yaml b/scripts/docker-compose/docker-compose.yaml index a1fd5c1b6..6aa5b7065 100644 --- a/scripts/docker-compose/docker-compose.yaml +++ b/scripts/docker-compose/docker-compose.yaml @@ -208,15 +208,6 @@ services: - sourcemapreader.env restart: unless-stopped - videostorage-openreplay: - image: public.ecr.aws/p1t3u8a3/videostorage:${COMMON_VERSION} - container_name: videostorage - networks: - - openreplay-net - env_file: - - videostorage.env - restart: unless-stopped - http-openreplay: image: public.ecr.aws/p1t3u8a3/http:${COMMON_VERSION} container_name: http diff --git a/scripts/docker-compose/install.sh b/scripts/docker-compose/install.sh index b4f64be7d..4e2395cee 100644 --- a/scripts/docker-compose/install.sh +++ b/scripts/docker-compose/install.sh @@ -115,7 +115,13 @@ case $yn in exit 1;; esac -sudo -E docker-compose --parallel 1 pull +services=$(sudo -E docker-compose config --services) +for service in $services; do + echo "Pulling image for $service..." + sudo -E docker-compose pull $service + sleep 5 +done + sudo -E docker-compose --profile migration up --force-recreate --build -d cp common.env common.env.bak echo "🎉🎉🎉 Done! 🎉🎉🎉" diff --git a/scripts/docker-compose/videostorage.env b/scripts/docker-compose/videostorage.env deleted file mode 100644 index 57f4b1c17..000000000 --- a/scripts/docker-compose/videostorage.env +++ /dev/null @@ -1,10 +0,0 @@ -AWS_ACCESS_KEY_ID=${COMMON_S3_KEY} -AWS_SECRET_ACCESS_KEY=${COMMON_S3_SECRET} -AWS_ENDPOINT='http://minio:9000' -AWS_REGION='us-east-1' -BUCKET_NAME=mobs -LICENSE_KEY='' -KAFKA_SERVERS='kafka.db.svc.cluster.local:9092' -KAFKA_USE_SSL='false' -REDIS_STRING='redis://redis:6379' -FS_CLEAN_HRS='24'