Commit 0004

samcro1967 · Sep 13, 2023 · 5d4d5ce · 5d4d5ce
1 parent 9c0da20
commit 5d4d5ce
Show file tree

Hide file tree

Showing 47 changed files with 307 additions and 2,093 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -34,21 +34,45 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.TOKEN }}
 
+    # Login to Docker Hub
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Build Docker Image
       run: |
         if [[ "${{ env.version }}" != "" ]]; then
-          docker build -t ghcr.io/samcro1967/docker-compose-ports-dump:latest -t ghcr.io/samcro1967/docker-compose-ports-dump:${{ env.version }} .
+          docker build \
+          -t ghcr.io/samcro1967/docker-compose-ports-dump:latest \
+          -t ghcr.io/samcro1967/docker-compose-ports-dump:${{ env.version }} \
+          -t osuhickeys/docker-compose-ports-dump:latest \
+          -t osuhickeys/docker-compose-ports-dump:${{ env.version }} \
+          .
         else
-          docker build -t ghcr.io/samcro1967/docker-compose-ports-dump:latest .
+          docker build \
+          -t ghcr.io/samcro1967/docker-compose-ports-dump:latest \
+          -t osuhickeys/docker-compose-ports-dump:latest \
+          .
         fi
 
-    - name: Push Docker Image
+    - name: Push Docker Image to GHCR
       run: |
         docker push ghcr.io/samcro1967/docker-compose-ports-dump:latest
         if [[ "${{ env.version }}" != "" ]]; then
           docker push ghcr.io/samcro1967/docker-compose-ports-dump:${{ env.version }}
         fi
 
+    # Push Docker Image to Docker Hub
+    - name: Push Docker Image to Docker Hub
+      run: |
+        docker push osuhickeys/docker-compose-ports-dump:latest
+        if [[ "${{ env.version }}" != "" ]]; then
+          docker push osuhickeys/docker-compose-ports-dump:${{ env.version }}
+        fi
+
     - name: Delete Old Untagged Versions
       uses: Chizkiyahu/delete-untagged-ghcr-action@v2
       with:

diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,6 @@ build/*
 src/.pylintrc
 codeql/*
 web/scripts/*
+web/archive/*
 config/dcpd_config.py
 dcpd_notes.txt
diff --git a/config/dcpd_config_example.py b/config/dcpd_config_example.py
@@ -9,7 +9,7 @@
 ]
 
 # Set the version
-VERSION = "v1.1.1"
+VERSION = "v1.2.0"
 
 # Replace with desired file name for the output html file
 DEFAULT_OUTPUT_HTML_FILE_NAME = "dcpd_output.html"

diff --git a/data/data/dcpd.csv b/data/data/dcpd.csv
diff --git a/data/data/dcpd.db b/data/data/dcpd.db
diff --git a/data/data/dcpd_bootstrap.log b/data/data/dcpd_bootstrap.log
diff --git a/data/data/dcpd_cache_location.json b/data/data/dcpd_cache_location.json