From 9c85845a42b5b0de1fa5abc5b1596e68e8b29bcc Mon Sep 17 00:00:00 2001
From: vimystic <122659254+vimystic@users.noreply.github.com>
Date: Tue, 6 Feb 2024 08:50:26 -0700
Subject: [PATCH] Vimystic/updatealpine (#10)

* add workflow_dispatch

* Update docker-publish.yaml

* Update Dockerfile (use previous version of config-merge)

* Trim the "v"
---
 .github/workflows/docker-publish.yaml | 3 ++-
 Dockerfile                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
index 8904ace..bd313da 100644
--- a/.github/workflows/docker-publish.yaml
+++ b/.github/workflows/docker-publish.yaml
@@ -6,6 +6,7 @@ on:
     - '**'
     branches:
     - '**'
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
@@ -49,7 +50,7 @@ jobs:
             type=ref,event=pr
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64
diff --git a/Dockerfile b/Dockerfile
index 1bbbe3a..60c2b65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,7 @@ RUN autoreconf -fi;\
   ./configure --with-oniguruma=builtin;\ 
   make LDFLAGS=-all-static
 
-FROM boxboat/config-merge:latest as config-merge
+FROM boxboat/config-merge:0.2.1 as config-merge
 
 FROM alpine:3