Skip to content

Commit

Permalink
Temporary revert s6 implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
MrTyton committed May 29, 2024
1 parent d198258 commit bd1229e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ RUN echo "*** Install FFF ***" && \
python3 -m pip --no-cache-dir install --extra-index-url https://testpypi.python.org/pypi FanFicFare==${FFF_RELEASE}; \
fi

ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz
#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
#RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
#RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
#RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz
#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
#RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz

RUN echo "**** cleanup ****" && \
rm -rf \
Expand All @@ -68,8 +68,8 @@ RUN echo "**** cleanup ****" && \

COPY root/ /

RUN chmod -R +777 /etc/cont-init.d/
RUN chmod -R +777 /etc/s6-overlay/
#RUN chmod -R +777 /etc/cont-init.d/
#RUN chmod -R +777 /etc/s6-overlay/
RUN chmod -R +777 /app/

# Temporary Workaround
Expand All @@ -78,5 +78,5 @@ VOLUME /config

WORKDIR /config

ENTRYPOINT ["/init"]
#CMD python -u /app/fanficdownload.py --config="/config/config.toml"
#ENTRYPOINT ["/init"]
CMD python -u /app/fanficdownload.py --config="/config/config.toml"
2 changes: 1 addition & 1 deletion release-versions/latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.05.28-3
2024.05.28-4

0 comments on commit bd1229e

Please sign in to comment.