fix ozone
This commit is contained in:
17
compose.yml
17
compose.yml
@@ -110,11 +110,11 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- ./envs/jetstream
|
- ./envs/jetstream
|
||||||
|
|
||||||
ozone-web:
|
ozone:
|
||||||
build:
|
build:
|
||||||
context: ./repos/ozone/
|
context: ./repos/ozone/
|
||||||
ports:
|
ports:
|
||||||
- 2586:3000
|
- 2585:3000
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/ozone/:/data/
|
- ./data/ozone/:/data/
|
||||||
@@ -124,16 +124,3 @@ services:
|
|||||||
database:
|
database:
|
||||||
condition: service_healthy
|
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
|
|
||||||
|
|
||||||
|
|||||||
16
install.zsh
16
install.zsh
@@ -132,14 +132,14 @@ export const DEFAULT_GEOLOCATION_CONFIG: Device['geolocation'] = {
|
|||||||
regionCode: undefined,
|
regionCode: undefined,
|
||||||
ageRestrictedGeos: [],
|
ageRestrictedGeos: [],
|
||||||
ageBlockedGeos: [],
|
ageBlockedGeos: [],
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DEFAULT_GEOLOCATION_STATUS: GeolocationStatus = {
|
export const DEFAULT_GEOLOCATION_STATUS: GeolocationStatus = {
|
||||||
countryCode: undefined,
|
countryCode: undefined,
|
||||||
regionCode: undefined,
|
regionCode: undefined,
|
||||||
isAgeRestrictedGeo: false,
|
isAgeRestrictedGeo: false,
|
||||||
isAgeBlockedGeo: false,
|
isAgeBlockedGeo: false,
|
||||||
}
|
}
|
||||||
GEOEOF
|
GEOEOF
|
||||||
|
|
||||||
# Add null check to geolocation config.ts to prevent fetch(null) errors
|
# Add null check to geolocation config.ts to prevent fetch(null) errors
|
||||||
@@ -271,16 +271,17 @@ function at-repos-build-docker-atproto() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-push-reset() {
|
function at-repos-push-reset() {
|
||||||
|
if [ -n "$(docker ps -q -f name=registry)" ]; then
|
||||||
|
echo "Registry is already running."
|
||||||
docker restart registry
|
docker restart registry
|
||||||
docker stop registry
|
docker stop registry
|
||||||
docker rm registry
|
docker rm registry
|
||||||
docker volume rm registry-data 2>/dev/null || true
|
docker volume rm registry-data 2>/dev/null || true
|
||||||
|
fi
|
||||||
docker run -d -p ${dport}:${dport} --name registry \
|
docker run -d -p ${dport}:${dport} --name registry \
|
||||||
--restart=always \
|
--restart=always \
|
||||||
-v registry-data:/var/lib/registry \
|
-v registry-data:/var/lib/registry \
|
||||||
registry:2
|
registry:2
|
||||||
sleep 3
|
|
||||||
docker run -d -p ${dport}:${dport} --name registry --restart=always registry:2
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function at-repos-push-docker() {
|
function at-repos-push-docker() {
|
||||||
@@ -289,10 +290,6 @@ function at-repos-push-docker() {
|
|||||||
service=${services[$i]}
|
service=${services[$i]}
|
||||||
docker tag at-${service}:latest localhost:${dport}/${service}:latest
|
docker tag at-${service}:latest localhost:${dport}/${service}:latest
|
||||||
docker push 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
|
done
|
||||||
else
|
else
|
||||||
docker tag at-${1}:latest localhost:${dport}/${1}:latest
|
docker tag at-${1}:latest localhost:${dport}/${1}:latest
|
||||||
@@ -313,7 +310,10 @@ case "`cat /etc/hostname`" in
|
|||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
if [ "$1" = "r" ];then
|
||||||
at-repos-push-reset
|
at-repos-push-reset
|
||||||
|
exit
|
||||||
|
fi
|
||||||
at-repos-clone
|
at-repos-clone
|
||||||
at-repos-pull
|
at-repos-pull
|
||||||
at-repos-social-app-icon
|
at-repos-social-app-icon
|
||||||
|
|||||||
Reference in New Issue
Block a user