diff --git a/Dockerfile b/Dockerfile index 92533e6..2b1c322 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,62 +1,28 @@ -FROM lsiobase/ubuntu:focal as builder - -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash && \ - apt-get -y --no-install-recommends install >/dev/null \ - nodejs \ - build-essential \ - git && \ - npm install --global yarn - -RUN git clone https://gitlab.com/RemixDev/deemix-gui.git --recursive - -WORKDIR /deemix-gui - -RUN yarn config set network-timeout 1000000 -g && \ - yarn install-all && \ - yarn build-server && \ - yarn build-webui && \ - yarn cache clean && \ - find . -name 'node_modules' -type d -prune -exec rm -rf '{}' \; - FROM lsiobase/ubuntu:focal ARG BUILDDATE ENV BUILDDATEENV=${BUILDDATE} LABEL \ - app.deemix.image.created="${BUILDDATE}" \ - app.deemix.image.url="https://gitlab.com/Bockiii/deemix-docker" \ - app.deemix.image.title="Docker image for Deemix" \ - app.deemix.image.description="Docker image for Deemix" \ - maintainer="Bocki" - -COPY --from=builder /deemix-gui /deemix-gui + app.deemix.image.created="${BUILDDATE}" \ + app.deemix.image.url="https://gitlab.com/Bockiii/deemix-docker" \ + app.deemix.image.title="Docker image for Deemix" \ + app.deemix.image.description="Docker image for Deemix" \ + maintainer="Bocki" RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash && \ - apt-get -y --no-install-recommends install >/dev/null \ - nodejs \ - jq \ - iputils-ping \ - curl && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - npm install --global yarn + apt-get -y --no-install-recommends install >/dev/null \ + nodejs \ + jq \ + iputils-ping \ + unzip \ + curl && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ + mkdir /downloads -RUN rm -R /config && \ - mkdir /deemix-gui/server/music && \ - mkdir -p /deem/.config/deemix && \ - ln -sf /deemix-gui/server/music /downloads && \ - ln -sf /deem/.config/deemix /config - -WORKDIR /deemix-gui - -RUN yarn config set network-timeout 1000000 -g && \ - yarn install --prod && \ - yarn --cwd server install --prod && \ - yarn cache clean - - -WORKDIR /deemix-gui +RUN curl -L -o deemix.zip http://gitlab.com/Bockiii/deemix-src/-/jobs/artifacts/master/download?job=dl_src && \ + unzip deemix COPY root/ / diff --git a/root/etc/cont-init.d/10-fix_folders b/root/etc/cont-init.d/10-fix_folders index ab72233..ac306a0 100644 --- a/root/etc/cont-init.d/10-fix_folders +++ b/root/etc/cont-init.d/10-fix_folders @@ -3,10 +3,8 @@ # test write access to download and config folder and test internet connectivity printf '[cont-init.d] Fixing Folder Permissions\n' -chown abc:abc /deemix-gui/server -chown -R abc:abc /deem chown -R abc:abc /config -chown -R abc:abc /deemix-gui/server/music +chown -R abc:abc /downloads # Fix misconfigured download locations. The container's download map is always /downloads. diff --git a/root/etc/services.d/deemix/run b/root/etc/services.d/deemix/run index f4ffc73..97f16b1 100644 --- a/root/etc/services.d/deemix/run +++ b/root/etc/services.d/deemix/run @@ -3,9 +3,7 @@ UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" -cd /deemix-gui/server - -HOME=/deem +cd / if [ ! -z ${INTPORT} ]; then port=$INTPORT @@ -13,6 +11,10 @@ else port=6595 fi +export DEEMIX_DATA_DIR=/config/ +export DEEMIX_MUSIC_DIR=/downloads/ +export DEEMIX_SERVER_PORT=$port +export DEEMIX_HOST=0.0.0.0 echo "[services.d] Starting Deemix" -s6-setuidgid abc yarn start-build --host 0.0.0.0 --port $port \ No newline at end of file +s6-setuidgid abc node /deemix-gui/server/dist/app.js \ No newline at end of file