diff --git a/CloudronManifest.json b/CloudronManifest.json index 038c379..41ad120 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -2,6 +2,6 @@ "version": "0.1.0", "healthCheckPath": "/", "httpPort": 1200, - "runtimeDirs": [ "/root/.npm" ], + "runtimeDirs": [ "/home/cloudron/.npm" ], "manifestVersion": 2 } diff --git a/Dockerfile b/Dockerfile index ffa1f30..408ec4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03fb02dd4e9d0286df RUN mkdir -p /app/code -WORKDIR /app/code +WORKDIR /app/code/ -RUN git clone https://github.com/DIYgod/RSSHub.git /app/code/rsshub -RUN cd /app/code/rsshub -RUN npm install /app/code/rsshub -RUN npm ci --production +RUN git clone https://git.hwarf.com/jglemza/RSSHub.git /app/code -COPY start.sh /app/pkg/ +RUN npm install +#RUN npm ci --omit=dev + +ADD start.sh /app/pkg/ CMD [ "/app/pkg/start.sh" ] diff --git a/start.sh b/start.sh index 4e29840..b2ca53a 100755 --- a/start.sh +++ b/start.sh @@ -1,4 +1,5 @@ #!/bin/bash - -cd /app/code/rsshub -npm start +set -eu +chown -R cloudron:cloudron /app/code +echo "Start RSSHub" +exec /usr/local/bin/gosu cloudron:cloudron npm start --prefix /app/code