diff --git a/docker/docker-py3-kms-minimal/Dockerfile b/docker/docker-py3-kms-minimal/Dockerfile index 858f62c..7e0a6c2 100644 --- a/docker/docker-py3-kms-minimal/Dockerfile +++ b/docker/docker-py3-kms-minimal/Dockerfile @@ -16,18 +16,18 @@ ENV LOGSIZE "" COPY ./py-kms /home/py-kms RUN apk add --no-cache --update \ - bash \ - git \ - py3-argparse \ - py3-flask \ - py3-pygments \ - python3-tkinter \ - sqlite-libs \ - py3-pip \ - tzdata \ + bash \ + git \ + py3-argparse \ + py3-flask \ + py3-pygments \ + python3-tkinter \ + sqlite-libs \ + py3-pip \ + tzdata \ shadow \ netcat-openbsd \ - build-base python3-dev \ + build-base python3-dev \ && pip3 install --no-cache peewee tzlocal pytz wheel \ && apk del git build-base python3-dev \ && addgroup power_users \ @@ -37,15 +37,16 @@ RUN apk add --no-cache --update \ # Fix undefined timezone, in case the user did not mount the /etc/localtime && ln -sf /usr/share/zoneinfo/UTC /etc/localtime +COPY docker/entrypoint.py /usr/bin/entrypoint.py +COPY docker/start.py /usr/bin/start.py + +RUN chmod 755 /usr/bin/entrypoint.py + WORKDIR /home/py-kms EXPOSE ${PORT}/tcp -COPY docker/entrypoint.py /usr/bin/entrypoint.py -COPY docker/start.py /usr/bin/start.py - -RUN chmod a+x /usr/bin/entrypoint.py -HEALTHCHECK --interval=5m --timeout=3s --start-period=10s --retries=4 CMD echo | nc -t localhost ${PORT} || exit 1 +HEALTHCHECK --interval=5m --timeout=3s --start-period=10s --retries=4 CMD echo | nc -z localhost ${PORT} || exit 1 ENTRYPOINT ["/usr/bin/python3", "-u","/usr/bin/entrypoint.py"] CMD ["/usr/bin/start.py"] diff --git a/docker/docker-py3-kms/Dockerfile b/docker/docker-py3-kms/Dockerfile index c4221ac..16ec7d2 100644 --- a/docker/docker-py3-kms/Dockerfile +++ b/docker/docker-py3-kms/Dockerfile @@ -19,33 +19,33 @@ ENV TZ America/Chicago COPY py-kms /home/py-kms/ #hadolint ignore=DL3013,DL3018 RUN apk add --no-cache --update \ - bash \ - git \ - python3 \ - py3-argparse \ - py3-flask \ - py3-pygments \ - python3-tkinter \ - sqlite-libs \ - py3-pip \ - build-base python3-dev \ - ca-certificates \ - duplicity \ - tzdata \ - shadow \ - netcat-openbsd \ - && git clone --branch master --depth 1 https://github.com/coleifer/sqlite-web.git /tmp/sqlite_web \ - && mv /tmp/sqlite_web/sqlite_web /home/ \ - && rm -rf /tmp/sqlite_web \ - && pip3 install --no-cache-dir peewee tzlocal pytz pysqlite3 wheel \ - && apk del git build-base python3-dev \ - && mkdir /db/ \ - && addgroup power_users \ - && adduser -S py-kms -G users -s /bin/bash \ - && usermod -a -G power_users py-kms \ - && chown py-kms:users /home/py-kms \ - # Fix undefined timezone, in case the user did not mount the /etc/localtime - && ln -sf /usr/share/zoneinfo/UTC /etc/localtime + bash \ + git \ + python3 \ + py3-argparse \ + py3-flask \ + py3-pygments \ + python3-tkinter \ + sqlite-libs \ + py3-pip \ + build-base python3-dev \ + ca-certificates \ + duplicity \ + tzdata \ + shadow \ + netcat-openbsd \ + && git clone --branch master --depth 1 https://github.com/coleifer/sqlite-web.git /tmp/sqlite_web \ + && mv /tmp/sqlite_web/sqlite_web /home/ \ + && rm -rf /tmp/sqlite_web \ + && pip3 install --no-cache-dir peewee tzlocal pytz pysqlite3 wheel \ + && apk del git build-base python3-dev \ + && mkdir /db/ \ + && addgroup power_users \ + && adduser -S py-kms -G users -s /bin/bash \ + && usermod -a -G power_users py-kms \ + && chown py-kms:users /home/py-kms \ + # Fix undefined timezone, in case the user did not mount the /etc/localtime + && ln -sf /usr/share/zoneinfo/UTC /etc/localtime COPY docker/entrypoint.py /usr/bin/entrypoint.py COPY docker/start.py /usr/bin/start.py @@ -57,7 +57,7 @@ WORKDIR /home/py-kms EXPOSE ${PORT}/tcp EXPOSE 8080 -HEALTHCHECK --interval=5m --timeout=3s --start-period=10s --retries=4 CMD echo | nc -t localhost ${PORT} || exit 1 +HEALTHCHECK --interval=5m --timeout=3s --start-period=10s --retries=4 CMD echo | nc -z localhost ${PORT} || exit 1 ENTRYPOINT [ "/usr/bin/python3","-u","/usr/bin/entrypoint.py" ] CMD ["/usr/bin/start.py"]