Update nginx_proxy build to use newly published modsecurity base images

jhampson-dbre · Jan 25, 2021 · 7f2a954 · 7f2a954
1 parent 38469f5
commit 7f2a954
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,18 +21,18 @@ jobs:
     - name: Checkout the repository
       uses: actions/checkout@v2
 
-    - name: Test modsecurity build
+    # - name: Test modsecurity build
+    #   uses: home-assistant/builder@master
+    #   with:
+    #     args: |
+    #       --test \
+    #       --all \
+    #       --target nginx_proxy/modsecurity/
+
+    - name: Test build
       uses: home-assistant/builder@master
       with:
         args: |
           --test \
           --all \
-          --target nginx_proxy/modsecurity/
-
-    # - name: Test build
-    #   uses: home-assistant/builder@master
-    #   with:
-    #     args: |
-    #       --test \
-    #       --aarch64 \
-    #       --target nginx_proxy/
+          --target nginx_proxy/
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,10 +16,17 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
+    # - name: Publish
+    #   uses: home-assistant/builder@master
+    #   with:
+    #     args: |
+    #       --all \
+    #       --target nginx_proxy/modsecurity/ \
+    #       --docker-hub jhampdbre
     - name: Publish
       uses: home-assistant/builder@master
       with:
         args: |
           --all \
-          --target nginx_proxy/modsecurity/ \
+          --target nginx_proxy/ \
           --docker-hub jhampdbre
diff --git a/nginx_proxy/Dockerfile b/nginx_proxy/Dockerfile
@@ -1,6 +1,6 @@
 ARG BUILD_FROM
 
-FROM jhampdbre/nginx-116-${BUILD_FROM} as build_modsecurity
+FROM jhampdbre/${BUILD_FROM}-nginx-116-modsecurity as build_modsecurity
 
 FROM $BUILD_FROM