diff --git a/compose.yaml b/compose.yml similarity index 72% rename from compose.yaml rename to compose.yml index 4679cad..8c039ae 100644 --- a/compose.yaml +++ b/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: - # context: ./repos/atproto/ - # dockerfile: services/bsky/Dockerfile + build: + context: ./repos/atproto/ + 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/ - diff --git a/install.zsh b/install.zsh index f1358f8..e167e94 100755 --- a/install.zsh +++ b/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 diff --git a/repos/.keep b/repos/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/repos/atproto b/repos/atproto deleted file mode 160000 index 22a96d6..0000000 --- a/repos/atproto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22a96d6b7459dbfd88c289ace88ec823e9adc6ee diff --git a/repos/bluesky-selfhost-env b/repos/bluesky-selfhost-env deleted file mode 160000 index 3e384e3..0000000 --- a/repos/bluesky-selfhost-env +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e384e3b58b8284c68e9562d16920867f8905340 diff --git a/repos/cookbook b/repos/cookbook deleted file mode 160000 index 03739f5..0000000 --- a/repos/cookbook +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03739f5268d5915e0dc7e8815723575f4b457bda diff --git a/repos/did-method-plc b/repos/did-method-plc deleted file mode 160000 index 39f28d1..0000000 --- a/repos/did-method-plc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39f28d196f06367735b2c544533954ac17cdcac4 diff --git a/repos/feed-generator b/repos/feed-generator deleted file mode 160000 index c14c54b..0000000 --- a/repos/feed-generator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c14c54bd65eb2ea638e0be4303a4b1af53a211a6 diff --git a/repos/indigo b/repos/indigo deleted file mode 160000 index c130614..0000000 --- a/repos/indigo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c130614850e554f9862d8e649373b53cee86dd3b diff --git a/repos/social-app b/repos/social-app deleted file mode 160000 index 6c9e1d4..0000000 --- a/repos/social-app +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c9e1d4837e9e385da5ca0c89c28000ad25c70d8