Enable dark frame capture in containers

README.md

@@ -104,9 +104,9 @@ https://github.com/aaronwmorris/indi-allsky/wiki/FAQ
 ## INDI support
 | Version         | Note |
 | --------------- | ---- |
-| v2.0.5          | Requires upgrade to indi-allsky v7.7 |
+| v2.0.5          | **Recommended**<br>Requires upgrade to indi-allsky v7.7 |
 | v2.0.4          | [Typo in indibash.h prevents building pyindi-client](https://github.com/aaronwmorris/indi-allsky/wiki/INDI-2.0.4-bug)<br>Svbony support is broken |
-| v2.0.3          | **Recommended** |
+| v2.0.3          |      |
 | v2.0.2          |      |
 | v2.0.1          |      |
 

docker/env_template

@@ -10,13 +10,19 @@ INDIALLSKY_INDI_GPS_DRIVER=
 # This folder needs to be shared to the capture, gunicorn, and nginx containers
 INDIALLSKY_IMAGE_FOLDER=/var/www/html/allsky/images
 
-INDIALLSKY_FLASK_AUTH_ALL_VIEWS=false
-INDIALLSKY_FLASK_SECRET_KEY=%INDIALLSKY_FLASK_SECRET_KEY%
-INDIALLSKY_FLASK_PASSWORD_KEY=%INDIALLSKY_FLASK_PASSWORD_KEY%
+# Set to "true" (without quotes) to take dark frames instead of normal image capture
+INDIALLSKY_DARK_CAPTURE_ENABLE=false
+INDIALLSKY_DARK_CAPTURE_MODE=sigmaclip
+INDIALLSKY_DARK_CAPTURE_BITMAX=16
+INDIALLSKY_DARK_CAPTURE_DAYTIME=--daytime
 
 # Folder for temporary files in capture process.  Uncomment to activate
 #CAPTURE_TMPDIR=/tmp
 
+INDIALLSKY_FLASK_AUTH_ALL_VIEWS=false
+INDIALLSKY_FLASK_SECRET_KEY=%INDIALLSKY_FLASK_SECRET_KEY%
+INDIALLSKY_FLASK_PASSWORD_KEY=%INDIALLSKY_FLASK_PASSWORD_KEY%
+
 INDIALLSKY_WEB_USER=%WEB_USER%
 INDIALLSKY_WEB_PASS=%WEB_PASS%
 INDIALLSKY_WEB_NAME=%WEB_NAME%
@@ -25,11 +31,12 @@ INDIALLSKY_WEB_EMAIL=%WEB_EMAIL%
 INDIALLSKY_MOSQUITTO_USER=%WEB_USER%
 INDIALLSKY_MOSQUITTO_PASS=%WEB_PASS%
 
-# remember to set back to false after first run
+# Set to "true" (without quotes) to generate a users API key
+# remember to set back to "false" after first run
 INDIALLSKY_WEB_GENERATE_APIKEY=false
 
 # Only used on the debian build
-INDIALLSKY_INDI_VERSION=v2.0.3
+INDIALLSKY_INDI_VERSION=v2.0.5
 INDIALLSKY_LIBCAMERA_TAG=HEAD
 INDIALLSKY_RPICAM_APPS_TAG=HEAD
 

docker/setup_env.sh

@@ -17,6 +17,11 @@ cd "$OLDPWD"
 
 
 if [ ! -f "${DOCKER_DIRECTORY}/.env" ]; then
+    sudo true
+    sudo apt-get update
+    sudo apt-get -f install \
+        python3-cryptography
+
 
     INDIALLSKY_FLASK_SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_hex())')
     INDIALLSKY_FLASK_PASSWORD_KEY=$(python3 -c 'from cryptography.fernet import Fernet; print(Fernet.generate_key().decode())')

docker/start_indi_allsky.sh

@@ -144,7 +144,17 @@ fi
 
 
 # start the program
-./allsky.py \
-    --log stderr \
-    run
 
+if [ "${INDIALLSKY_DARK_CAPTURE_ENABLE:-false}" == "true" ]; then
+    # take dark frames
+    echo "*** Starting dark frame capture ***"
+    ./darks.py \
+        --bitmax "${INDIALLSKY_DARK_CAPTURE_BITMAX:-16}" \
+        "${INDIALLSKY_DARK_CAPTURE_DAYTIME:-}" \
+        "${INDIALLSKY_DARK_CAPTURE_MODE:-average}"
+else
+    # normal capture
+    ./allsky.py \
+        --log stderr \
+        run
+fi

misc/build_indi.sh

@@ -20,7 +20,7 @@ if [ -n "${1:-}" ]; then
     INDI_CORE_TAG="$1"
     INDI_3RDPARTY_TAG=$INDI_CORE_TAG
 else
-    INDI_CORE_TAG="v2.0.3"
+    INDI_CORE_TAG="v2.0.5"
     INDI_3RDPARTY_TAG=$INDI_CORE_TAG
 fi
 

setup.sh

@@ -68,6 +68,8 @@ WEB_PASS="${INDIALLSKY_WEB_PASS:-}"
 WEB_NAME="${INDIALLSKY_WEB_NAME:-}"
 WEB_EMAIL="${INDIALLSKY_WEB_EMAIL:-}"
 
+OPTIONAL_PYTHON_MODULES="${INDIALLSKY_OPTIONAL_PYTHON_MODULES:-false}"
+
 PYINDI_2_0_4="git+https://github.com/indilib/pyindi-client.git@6f8fa80#egg=pyindi-client"
 PYINDI_2_0_0="git+https://github.com/indilib/pyindi-client.git@674706f#egg=pyindi-client"
 PYINDI_1_9_9="git+https://github.com/indilib/pyindi-client.git@ce808b7#egg=pyindi-client"
@@ -1893,7 +1895,7 @@ pip3 install --upgrade pip setuptools wheel
 pip3 install -r "${ALLSKY_DIRECTORY}/${VIRTUALENV_REQ}"
 
 
-if [ -n "${OPTIONAL_PYTHON_MODULES:-}" ]; then
+if [ "${OPTIONAL_PYTHON_MODULES}" == "true" ]; then
     pip3 install -r "${ALLSKY_DIRECTORY}/${VIRTUALENV_REQ_OPT}"
 fi