🔥 Cleanup

docker-compose.yml

@@ -5,26 +5,26 @@ services:
     restart: unless-stopped
     image: zeitgitter/zeitgitter
     build: ./zeitgitter
-    container_name: zeitgitter
     env_file:
       # Adapt from "sample.env"
       - "server.env"
     ports:
       - 15177:15177
     volumes:
       - ./persistent-data:/persistent-data
-  # Only if you do not already have a reverse proxy with TLS termination:
-  reverse-proxy:
-    restart: unless-stopped
-    image: steveltn/https-portal
-    env_file:
-      - "server.env" # For ZEITGITTER_DOMAIN
-    ports:
-      - "80:80"
-      - "443:443"
-    environment:
-      # Activate if desired:
-      # HSTS_MAX_AGE: "32000000; includeSubdomains; preload"
-      # Activate when ready for production Let's Encrypt certificates:
-      # STAGE: "production"
-      DOMAINS: "$ZEITGITTER_DOMAIN -> zeitgitter:15177"
+
+# Only if you do not already have a reverse proxy with TLS termination:
+#  reverse-proxy:
+#    restart: unless-stopped
+#    image: steveltn/https-portal
+#    env_file:
+#      - "server.env" # For ZEITGITTER_DOMAIN
+#    ports:
+#      - "80:80"
+#      - "443:443"
+#    environment:
+#      # Activate if desired (good practice):
+#      # HSTS_MAX_AGE: "32000000; includeSubdomains"
+#      # Activate when ready for production Let's Encrypt certificates:
+#      # STAGE: "production"
+#      DOMAINS: "$ZEITGITTER_DOMAIN -> zeitgitter:15177"

zeitgitter/Dockerfile

@@ -4,7 +4,8 @@ FROM debian:buster-slim
 # Explicit python3-pygit2 install is required for ARMv6 only.
 # Explicit dpkg install seens to be required for arm64 only.
 RUN apt update && \
-    apt install -y --no-install-recommends gnupg gnupg1 libgit2-dev python3-pygit2 python3-pip python3-setuptools git wget dpkg ssh-client && \
+    apt install -y --no-install-recommends gnupg gnupg1 libgit2-dev python3-pygit2 \
+	python3-pip python3-setuptools python3-wheel git wget dpkg ssh-client && \
     apt clean && \
     rm -rf /var/lib/apt/lists
 
@@ -16,7 +17,7 @@ RUN python3 -c "import pygit2"
 # For this, `##DEVONLY##` strings at the start of the line will be removed for
 # the dev # build Dockerfile, whereas lines ending in `##PRODONLY##` will be
 # deleted.
-RUN pip3 install "zeitgitterd>=1.0.4" ##PRODONLY##
+RUN pip3 install zeitgitterd ##PRODONLY##
 ##DEVONLY## COPY zeitgitterd-*.whl /root/
 ##DEVONLY## RUN pip3 install /root/zeitgitterd-*.whl
 
@@ -39,5 +40,5 @@ VOLUME /persistent-data
 
 # Runtime settings
 EXPOSE 15177
-ENTRYPOINT ["/run-zeitgitterd.sh", "--listen-address", "0.0.0.0"]
+CMD ["/run-zeitgitterd.sh", "--listen-address", "0.0.0.0"]
 HEALTHCHECK --timeout=3s CMD ["/health.sh"]