fix: added python3 to dockerfile install and updated dependency tests

Johnny-Knighten · Nov 29, 2023 · b6db7e2 · b6db7e2
1 parent 0bdc02c
commit b6db7e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -53,7 +53,8 @@ RUN set -x && \
                         cron=3.0pl1-137ubuntu3 \
                         tzdata=2023c-0ubuntu0.22.04.2 \
                         zip=3.0-12build2 \
-                        unzip=6.0-26ubuntu3.1 && \
+                        unzip=6.0-26ubuntu3.1 \
+                        python3=3.10.6-1~22.04 && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/glorious_eggroll

diff --git a/tests/dependencies.sh b/tests/dependencies.sh
@@ -62,16 +62,28 @@ perform_test "Verify GE's Wine Proton Fork's Wine Executable Exists" \
                 johnnyknighten/ark-sa-server:latest \
                 -f /opt/glorious_eggroll/proton/bin/wine"
 
+perform_test "Verify supervisord.conf Is Present" \
+            'docker run --rm \
+              --entrypoint bash \
+              johnnyknighten/ark-sa-server:latest \
+              -c "test -f /usr/local/etc/supervisord.conf"'
+
+perform_test "Verify Python Is Installed" \
+            'docker run --rm \
+              --entrypoint bash \
+              johnnyknighten/ark-sa-server:latest \
+              -c "python3 --version"'
+
 perform_test "Verify ark-sa-container/bin Content is Present" \
-            "docker run --rm \
+            'docker run --rm \
               --entrypoint bash \
               johnnyknighten/ark-sa-server:latest \
-              -c \"test -f /usr/local/bin/system-bootstrap.sh && \
+              -c "test -f /usr/local/bin/system-bootstrap.sh && \
                   test -f /usr/local/bin/ark-sa-bootstrap.sh && \
                   test -f /usr/local/bin/ark-sa-server.sh && \
                   test -f /usr/local/bin/ark-sa-updater.sh && \
                   test -f /usr/local/bin/ark-sa-backup.sh && \
-                  test -f /usr/local/bin/ark-sa/config-templating/bootstrap-configs.sh && \
-                  test -f /usr/local/bin/ark-sa/config-templating/GameUserSettings.template.ini \""
+                  test -f /usr/local/bin/config_from_env_vars/__init__.py && \
+                  test -f /usr/local/bin/config_from_env_vars/main.py"'
 
 log_failed_tests