fix docker

compose.yml

@@ -24,18 +24,6 @@ services:
       timeout: 5s
       retries: 5
 
-  pds-fix-permission:
-    image: alpine:latest
-    volumes:
-      - ./data/pds/:/data/
-    command: chown 1000.1000 /data
-
-  bsky-fix-permission:
-    image: alpine:latest
-    volumes:
-      - ./data/bsky/:/data/
-    command: chown 1000.1000 /data
-
   plc:
     ports:
       - 2582:3000
@@ -52,8 +40,6 @@ services:
   pds:
     ports:
       - 2583:3000
-    #image: itaru2622/bluesky-atproto-pds
-    #image: ghcr.io/bluesky-social/pds:latest
     build:
       context: ./repos/atproto/
       dockerfile: services/pds/Dockerfile
@@ -65,8 +51,6 @@ services:
     depends_on:
       database:
         condition: service_healthy
-      pds-fix-permission:
-        condition: service_completed_successfully
 
   bgs:
     ports:
@@ -121,7 +105,6 @@ services:
   social-app:
     ports:
       - 8100:8100
-        #image: itaru2622/bluesky-social-app
     build:
       context: ./repos/social-app/
       dockerfile: Dockerfile
@@ -133,34 +116,18 @@ services:
   bsky:
     ports:
       - 2584:2584
-    image: itaru2622/bluesky-atproto-bsky
+    build:
-      #build:
+      context: ./repos/atproto/
-      #  context: ./repos/atproto/
+      dockerfile: services/bsky/Dockerfile
-      #  dockerfile: services/bsky/Dockerfile
     restart: always
     env_file:
       - ./envs/bsky
     user: root
     volumes:
       - ./data/bsky/:/data/
-        #      - ./repos/bsky.js:/app/services/bsky/api.js:ro
     command: node --enable-source-maps api.js
     depends_on:
       database:
         condition: service_healthy
       redis:
         condition: service_healthy
-      bsky-fix-permission:
-        condition: service_completed_successfully
-
-  feed:
-    ports:
-      - 2586:2586
-    build:
-      context: ./repos/feed-generator/
-    restart: always
-    env_file:
-      - ./envs/feed
-    volumes:
-      - ./data/feed/:/data/
-

install.zsh

@@ -46,7 +46,9 @@ function at-repos-token() {
 }
 
 function at-repos-clone() {
-	mkdir -p $d/repos
+	if [ ! -d $d/repos ];then
+		mkdir -p $d/repos
+	fi
 	cd $d/repos
 	for ((i=1; i<=${#repos}; i++)); do
 		repo=${repos[$i]}
@@ -68,7 +70,6 @@ function at-repos-pull() {
 		if [ -d $d/repos/${repo##*/} ];then
 			cd $d/repos/${repo##*/}
 			if ! git pull;then
-				cd $d/repos
 				rm -rf $d/repos/${repo##*/}
 				at-repos-clone
 			fi

repos/atproto

@@ -1 +0,0 @@
-Subproject commit 22a96d6b7459dbfd88c289ace88ec823e9adc6ee

repos/bluesky-selfhost-env

@@ -1 +0,0 @@
-Subproject commit 3e384e3b58b8284c68e9562d16920867f8905340

repos/cookbook

@@ -1 +0,0 @@
-Subproject commit 03739f5268d5915e0dc7e8815723575f4b457bda

repos/did-method-plc

@@ -1 +0,0 @@
-Subproject commit 39f28d196f06367735b2c544533954ac17cdcac4

repos/feed-generator

@@ -1 +0,0 @@
-Subproject commit c14c54bd65eb2ea638e0be4303a4b1af53a211a6

repos/indigo

@@ -1 +0,0 @@
-Subproject commit c130614850e554f9862d8e649373b53cee86dd3b

repos/social-app

@@ -1 +0,0 @@
-Subproject commit 6c9e1d4837e9e385da5ca0c89c28000ad25c70d8