fix ozone

compose.yml

@@ -110,11 +110,11 @@ services:
     env_file:
       - ./envs/jetstream
 
-  ozone-web:
+  ozone:
     build:
       context: ./repos/ozone/
     ports:
-      - 2586:3000
+      - 2585:3000
     restart: always
     volumes:
       - ./data/ozone/:/data/
@@ -124,16 +124,3 @@ services:
       database:
         condition: service_healthy
 
-  ozone:
-    build:
-      context: ./repos/atproto/
-      dockerfile: services/ozone/Dockerfile
-    ports:
-      - 2585:3000
-    restart: always
-    command: node --enable-source-maps api.js
-    volumes:
-      - ./data/ozone/:/data/
-    env_file:
-      - ./envs/ozone
-

install.zsh

@@ -18,7 +18,7 @@ function at-repos-env() {
 		https://github.com/bluesky-social/ozone
 		https://github.com/bluesky-social/jetstream
 	)
-	services=( bsky plc pds jetstream bgs ozone social-app )
+	services=( bsky plc pds jetstream bgs ozone ozone-web social-app )
 	d=${0:a:h}
 	dh=${0:a:h:h}
 	name=${host%%.*}
@@ -59,7 +59,7 @@ function at-repos-clone() {
 		echo $repo
 		if [ ! -d $d/repos/${repo##*/} ];then
 			git clone $repo
-		
+
 		fi
 	done
 	if [ ! -f $d/repos/feed-generator/Dockerfile ] && [ -f $d/docker/feed/Dockerfile ];then
@@ -128,18 +128,18 @@ export const BAPP_CONFIG_URL = null
 export const GEOLOCATION_CONFIG_URL = BAPP_CONFIG_URL
 
 export const DEFAULT_GEOLOCATION_CONFIG: Device['geolocation'] = {
-  countryCode: undefined,
+		countryCode: undefined,
-  regionCode: undefined,
+		regionCode: undefined,
-  ageRestrictedGeos: [],
+		ageRestrictedGeos: [],
-  ageBlockedGeos: [],
+		ageBlockedGeos: [],
-}
+	}
 
 export const DEFAULT_GEOLOCATION_STATUS: GeolocationStatus = {
-  countryCode: undefined,
+		countryCode: undefined,
-  regionCode: undefined,
+		regionCode: undefined,
-  isAgeRestrictedGeo: false,
+		isAgeRestrictedGeo: false,
-  isAgeBlockedGeo: false,
+		isAgeBlockedGeo: false,
-}
+	}
 GEOEOF
 
 	# Add null check to geolocation config.ts to prevent fetch(null) errors
@@ -271,16 +271,18 @@ function at-repos-build-docker-atproto() {
 }
 
 function at-repos-push-reset() {
-	docker restart registry
+	if [ -n "$(docker ps -q -f name=registry)" ]; then
-	docker stop registry
+		echo "Registry is already running."
-	docker rm registry
+		docker restart registry
-	docker volume rm registry-data 2>/dev/null || true
+		docker stop registry
+		docker rm registry
+		docker volume rm registry-data 2>/dev/null || true
+	fi
 	docker run -d -p ${dport}:${dport} --name registry \
 		--restart=always \
 		-v registry-data:/var/lib/registry \
 		registry:2
-	sleep 3
+	fi
-	docker run -d -p ${dport}:${dport} --name registry --restart=always registry:2
 }
 
 function at-repos-push-docker() {
@@ -289,10 +291,6 @@ function at-repos-push-docker() {
 			service=${services[$i]}
 			docker tag at-${service}:latest localhost:${dport}/${service}:latest
 			docker push localhost:${dport}/${service}:latest
-			if [ "$service" = "ozone" ];then
-				docker tag at-${service}:latest localhost:${dport}/${service}-web:latest
-				docker push localhost:${dport}/${service}-web:latest
-			fi
 		done
 	else
 		docker tag at-${1}:latest localhost:${dport}/${1}:latest
@@ -313,7 +311,9 @@ case "`cat /etc/hostname`" in
 		exit
 		;;
 	*)
-		at-repos-push-reset
+		if [ $1 = "r" ];then
+			at-repos-push-reset
+		fi
 		at-repos-clone
 		at-repos-pull
 		at-repos-social-app-icon