fix download-data.sh

storytellerF · Jan 30, 2025 · eead88c · eead88c
1 parent dafa44e
commit eead88c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -37,10 +37,10 @@ jobs:
           cache: gradle
 
       - name: Build mini app
-        run: ./scripts/build_scripts/build-app-on-ci.sh mini www.acommunity.link/
+        run: ./scripts/build_scripts/build-app-on-ci.sh mini www.acommunity.link
 
       - name: Build koyeb app
-        run: ./scripts/build_scripts/build-app-on-ci.sh koyeb respectable-jobie-anabn-3d54150c.koyeb.app/server/
+        run: ./scripts/build_scripts/build-app-on-ci.sh koyeb respectable-jobie-anabn-3d54150c.koyeb.app/server
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ COPY . .
 RUN find scripts/ -type f \( -name "*.sh" -o -name "*.js" \) -exec sed -i 's/\r$//' {} + && \
     sed -i 's/\r$//' gradlew
 
-RUN ./scripts/download_scripts/download_data.sh
+RUN ./scripts/download_scripts/download-data.sh
 
 ENV HOST_TYPE=docker
 

diff --git a/Dockerfile.patched b/Dockerfile.patched
@@ -175,7 +175,7 @@ RUN mkdir -p build/envs && cp ./${FLAVOR}.env ./build/envs/.env
 RUN find scripts/ -type f \( -name "*.sh" -o -name "*.js" \) -exec sed -i 's/\r$//' {} + && \
     sed -i 's/\r$//' gradlew
 
-RUN ./scripts/download_scripts/download_data.sh
+RUN ./scripts/download_scripts/download-data.sh
 
 ENV HOST_TYPE=docker
 

diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -56,6 +56,8 @@ services:
 
   bunkerweb:
     image: bunkerity/bunkerweb:${BUNKER_VERSION}
+    depends_on:
+      - bw-db
     ports:
       - ${BUNKER_PORT}:8080
       - ${BUNKER_PORT_SECRET}:8443
@@ -96,6 +98,7 @@ services:
     depends_on:
       - bunkerweb
       - bw-docker
+      - bw-db
     environment:
       - DATABASE_URI=${BUNKER_DB_URI}
       - DOCKER_HOST=tcp://bw-docker:2375
@@ -120,6 +123,7 @@ services:
     image: bunkerity/bunkerweb-ui:1.5.12
     depends_on:
       - bw-docker
+      - bw-db
     environment:
       - DATABASE_URI=${BUNKER_DB_URI}
       - DOCKER_HOST=tcp://bw-docker:2375

diff --git a/scripts/download_scripts/download_data.sh → scripts/download_scripts/download-data.sh b/scripts/download_scripts/download_data.sh → scripts/download_scripts/download-data.sh
@@ -2,12 +2,12 @@
 set -e
 # 检查参数个数
 if [ "$#" -eq 2 ]; then
-    echo "try use env"
+    echo "try use args"
     export PRESET_ENCRYPTED_URI=$1
-    export PRESET_ENCRYPTED_PRESET_ENCRYPTED_PASSWORD=$2
+    export PRESET_ENCRYPTED_PASSWORD=$2
 fi
 
-if [ -z "$PRESET_ENCRYPTED_URI" ] || [ -z "$PRESET_ENCRYPTED_PRESET_ENCRYPTED_PASSWORD" ]; then
+if [ -z "$PRESET_ENCRYPTED_URI" ] || [ -z "$PRESET_ENCRYPTED_PASSWORD" ]; then
     echo "skip download preset data"
     exit 0
 fi