tweak docker steps (#25)

mwood77 · Apr 9, 2024 · 487406d · 487406d
1 parent 061fe98
commit 487406d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - 'main'
+    tags:
+      - "v*.*.*"
   release:
     types: [published]
 
@@ -34,13 +36,14 @@ jobs:
         with:
           images: ${{ secrets.DOCKERHUB_USERNAME }}/pf2opn
           tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
             type=semver,pattern={{version}}
-            # dynamically set the branch name as a prefix
-            type=sha,prefix={{branch}}-
-            # dynamically set the branch name
-            type=raw,value={{branch}}-latest
-            # set the latest branch name
-            type=raw,value=latest
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha   
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ A simple pfsense to opnsense config mapper.
 
 ### Run it with docker:
 ```
-docker run --name pf2opn -p 4200:80 -d mwood77/pf2opn
+docker run --name pf2opn -p 4200:80 -d mwood77/pf2opn:latest
 ```
 
 ### Use it on the web:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pf2open",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",