Merge branch 'gh-actions' of github.com:3scale-labs/dnsmasq into gh-a…

…ctions
3scale-labs · Apr 23, 2024 · bd27d46 · bd27d46
2 parents 6dbd0c2 + e3e9bee
commit bd27d46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/buildah.yml b/.github/workflows/buildah.yml
@@ -1,18 +1,16 @@
 name: Build dnsmasq oci container image
 
 on:
+  push:
+    branches:
+      - gh-actions
   workflow_dispatch:
     inputs:
       custom_tag:
         description: optional custom tag on remote repo you want image to be tagged with
         required: false
         default: 'latest'
         type: string
-    secrets:
-      QUAY_USER_NAME:
-        required: false
-      QUAY_PASSWORD:
-        required: false
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -58,7 +56,7 @@ jobs:
           extra-args: |
             --squash
           containerfiles: |
-            Copntainerfile
+            Containerfile
 
       - name: Echo Outputs
         run: |

diff --git a/Containerfile b/Containerfile
@@ -1,10 +1,10 @@
+FROM registry.access.redhat.com/ubi9/ubi
+
 LABEL maintainer="3scale system team <[email protected]>"
 LABEL org.opencontainers.image.title="dnsmasq",
 LABEL org.opencontainers.image.source="https://github.com/3scale/dnsmasq"
 LABEL org.opencontainers.image.vendor="3scale"
 
-FROM registry.access.redhat.com/ubi9/ubi
-
 RUN dnf -y install dnsmasq
 EXPOSE 53 67 69
 ENTRYPOINT ["/usr/sbin/dnsmasq"]