Re-activated the GitHub action to build and publish the docker image.

Signed-off-by: Michael Keller <[email protected]>

Author: mikeller

.github/workflows/android-dockerimage.disabled renamed to .github/workflows/android-dockerimage

@@ -1,33 +1,26 @@
 name: Android Docker Image CI
 
-# -- disabled for now, as the resulting image is HUGE and causes our
-#    Android builds to fail
-#on:
-#  push:
-#    paths:
-#    - scripts/docker/android-build-container/Dockerfile
-#    - .github/workflows/android-docker*
-
-# this is here to prevent errors about not having an on: clause
 on:
-  repository_dispatch:
-    types:
-    - unused
+  - workflow_dispatch
+  - push:
+    paths:
+    - scripts/docker/android-build-container
+    - .github/workflows/android-docker*
+    - packaging/android/android-build-setup.sh
+    - packaging/android/variables.sh
 
 jobs:
   android-build-container:
     runs-on: ubuntu-latest
     env:
-      VERSION: ${{ '5.13.10' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image
+      VERSION: ${{ '5.15.2' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image
 
     steps:
     - uses: actions/checkout@v1
 
     - name: Get our pre-reqs
       run: |
           cd scripts/docker/android-build-container
-          bash download.sh
-          sed -ie 's/^sudo/#sudo/' setup-docker.sh
           bash setup-docker.sh
 
     - name: set env

scripts/docker/android-build-container/Dockerfile

@@ -15,6 +15,7 @@ RUN apt-get update  && \
 
 WORKDIR /android
 
+# Scrape the manually curated Qt install from the previous build image
 COPY --from=base /android/5.15.1 5.15.1
 
 # install, NDK and SDK there, plus the three files from the Subsurface

scripts/docker/android-build-container/download.sh

@@ -16,5 +16,9 @@
 cp ../../../packaging/android/android-build-setup.sh .
 cp ../../../packaging/android/variables.sh .
 
+if [ $1 == "-no-docker-build" ]; then
+    exit 0
+fi
+
 # create the container (this takes a while)
 docker build -t android-build .