From babfad9b78a0966f2e4f147f69d2a3a7798e9201 Mon Sep 17 00:00:00 2001 From: Luke Else Date: Sat, 1 Feb 2025 13:33:49 +0000 Subject: [PATCH] Updated container registry and launch order --- Websites/docker-compose.yml | 4 ++-- main-spinup.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Websites/docker-compose.yml b/Websites/docker-compose.yml index 0d38d83..1d2140c 100644 --- a/Websites/docker-compose.yml +++ b/Websites/docker-compose.yml @@ -4,7 +4,7 @@ services: #Websites luke-else.co.uk (8000) snexo.co.uk (8001) divine-couture.co.uk (80) wmgzon.luke-else.co.uk (8080) luke-else: - build: ./luke-else.co.uk + image: git.luke-else.co.uk/luke-else/luke-else.co.uk container_name: luke-else networks: - proxy @@ -23,7 +23,7 @@ services: restart: unless-stopped divine-couture: - image: lukeelse/divine-couture.co.uk:latest + image: git.luke-else.co.uk/luke-else/divine-couture.co.uk:latest container_name: divine-couture networks: - proxy diff --git a/main-spinup.sh b/main-spinup.sh index a248849..711b966 100644 --- a/main-spinup.sh +++ b/main-spinup.sh @@ -2,16 +2,18 @@ cd ./Traefik/ docker-compose pull && docker-compose up -d -cd .. - -cd ./Websites/ -docker-compose pull && docker-compose up -d cd .. cd ./Development/Gitea/ docker-compose pull && docker-compose up -d cd ../.. +sleep 20 # Allow Gitea + registry to start up before starting the rest of the services + +cd ./Websites/ +docker-compose pull && docker-compose up -d +cd .. + cd ./Database/ docker-compose pull && docker-compose up -d cd ..