fix(ci): permission of alist binary in docker; entrypoint logic

Mmx233 · Dec 30, 2024 · d2236af · d2236af
1 parent 6544061
commit d2236af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -30,7 +30,8 @@ RUN apk update && \
 
 COPY --from=builder /app/bin/alist ./
 COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh && /entrypoint.sh version
+RUN chmod +x /opt/alist/alist && \
+    chmod +x /entrypoint.sh && /entrypoint.sh version
 
 ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
 VOLUME /opt/alist/data/

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -22,7 +22,8 @@ RUN apk update && \
 
 COPY /build/${TARGETPLATFORM}/alist ./
 COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh && /entrypoint.sh version
+RUN chmod +x /opt/alist/alist && \
+    chmod +x /entrypoint.sh && /entrypoint.sh version
 
 ENV PUID=0 PGID=0 UMASK=022 RUN_ARIA2=${INSTALL_ARIA2}
 VOLUME /opt/alist/data/

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,19 +1,19 @@
 #!/bin/bash
 
-chown -R ${PUID}:${PGID} /opt/alist/
-
 umask ${UMASK}
 
-if [ "$RUN_ARIA2" = "true" ]; then
-  exec su-exec ${PUID}:${PGID} nohup aria2c \
-    --enable-rpc \
-    --rpc-allow-origin-all \
-    --conf-path=/root/.aria2/aria2.conf \
-    >/dev/null 2>&1 &
-fi
-
 if [ "$1" = "version" ]; then
   ./alist version
 else
+  chown -R ${PUID}:${PGID} /opt/alist/
+
+  if [ "$RUN_ARIA2" = "true" ]; then
+    exec su-exec ${PUID}:${PGID} nohup aria2c \
+      --enable-rpc \
+      --rpc-allow-origin-all \
+      --conf-path=/root/.aria2/aria2.conf \
+      >/dev/null 2>&1 &
+  fi
+
   exec su-exec ${PUID}:${PGID} ./alist server --no-prefix
 fi