Working on v1.2.0

.dockerignore

@@ -2,5 +2,5 @@
 *
 
 # Whitelist these files
+!entrypoint.d/
 !healthcheck.py
-!__init__.py

Dockerfile

@@ -22,8 +22,8 @@ RUN python3 -m venv /app/.opentakserver_venv
 # Enable venv
 ENV PATH="/app/.opentakserver_venv/bin:$PATH"
 
-# Install Opentakserver
-RUN pip3 install --no-cache-dir opentakserver==${BUILD_VERSION}
+# Install Opentakserver, if $BUILD_VERSION is not set, install latest
+RUN pip3 install --no-cache-dir opentakserver${BUILD_VERSION:+==$BUILD_VERSION}
 
 # ************************************************************
 # Second stage: runtime
@@ -43,7 +43,7 @@ ENV PATH="/app/.opentakserver_venv/bin:$PATH"
 LABEL maintainer="https://github.com/milsimdk"
 LABEL org.opencontainers.image.title="Docker image for OpenTAKServer"
 LABEL org.opencontainers.image.description="OpenTAKServer is yet another open source TAK Server for ATAK, iTAK, and WinTAK"
-LABEL org.opencontainers.image.version="${BUILD_VERSION}"
+LABEL org.opencontainers.image.version="${BUILD_VERSION:-latest}"
 LABEL org.opencontainers.image.authors="Brian - https://github.com/brian7704"
 LABEL org.opencontainers.image.vendor="https://github.com/milsimdk"
 LABEL org.opencontainers.image.source="https://github.com/milsimdk/ots-docker-image"
@@ -63,10 +63,10 @@ COPY --from=builder /app/.opentakserver_venv /app/.opentakserver_venv
 RUN pip3 uninstall -y bcrypt && pip3 install bcrypt==4.0.1
 
 # Add Healthcheck for OTS
-COPY __init__.py healthcheck.py /app/scripts/
-RUN chmod +x /app/scripts/*
+COPY --chmod=755 ./entrypoint.d/ /etc/entrypoint.d
+COPY --chmod=755 ./healthcheck.py /app
 
-#HEALTHCHECK --interval=1m --start-period=1m CMD python3 /app/scripts/healthcheck.py
+#HEALTHCHECK --interval=1m --start-period=30s CMD /app/healthcheck.py
 
 # Run as OTS user
 USER ots
@@ -84,5 +84,5 @@ EXPOSE 8088/tcp
 # 8089 SSL CoT streaming port
 EXPOSE 8089/tcp
 
-#ENTRYPOINT [ "python3" ]
-CMD [ "python3", "/app/scripts/__init__.py" ]
+ENTRYPOINT [ "/etc/entrypoint.d/docker-entrypoint.sh" ]
+CMD ["python3", "-m", "opentakserver.app"]

README.md

@@ -1,24 +1,23 @@
-
+# Docker image for OpenTAKServer
 ---
 
-# NOT READY FOR PRODUCTION YET
+### NOT READY FOR PRODUCTION YET
 
 ---
 
-# Docker image for OpenTAKServer
-
 Used here: https://github.com/milsimdk/ots-docker
 
+### Requirements
+ - Docker must be installed
+ - Docker compose v2 is used
+ - Platform support: linux/amd64, linux/arm64
 
-- Source: https://github.com/brian7704/OpenTAKServer
-- Platform support: linux/amd64, linux/arm64
-
-### Thanks
-  - [Brian](https://github.com/brian7704) for creating OpenTAKServer
-
-## Build arguments defaults
+### Build arguments defaults
 ```Dockerfile
-ARG OTS_VERSION
+ARG BUILD_VERSION
 ARG PGID=1000
 ARG PUID=1000
 ```
+
+### Thanks
+  - [Brian](https://github.com/brian7704) for creating [OpenTAKServer](https://github.com/brian7704/OpenTAKServer)

__init__.py → entrypoint.d/__init__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-import os, yaml, subprocess;
+import os, yaml;
 from opentakserver.defaultconfig import DefaultConfig;
 from flask.config import Config as FlaskConfig;
 
@@ -61,8 +61,3 @@ def save_config(config):
 
 # Start the OpenTAKServer app
 print('Container init | Starting OpenTAKServer...')
-try:
-    ots = subprocess.Popen( ['python3', '-m', 'opentakserver.app'], start_new_session=True )
-    ots.wait()
-except KeyboardInterrupt:
-    ots.close()

entrypoint.d/docker-entrypoint.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
+## Running __init__.py script
+if [[ "${@: -1}" = "opentakserver.app" ]]; then
+    python3 /etc/entrypoint.d/__init__.py
+fi
+
+## Running passed command
+if [[ "$1" ]]; then
+	exec "$@"
+fi

healthcheck.py

@@ -1,10 +1,11 @@
+#!/usr/bin/env python3
 import requests, sys;
 
 URL = "http://localhost:8081/api/health"
 
 try:
     response = requests.head(URL)
-except Exception as e:mak
+except Exception as e:
     sys.exit(1)
 else:
     if response.status_code == 200: