Merge pull request #15 from mhzawadi/dev

Alpine v3.17 and Github actions
mhzawadi · Jan 26, 2023 · a7237dd · a7237dd
2 parents 8295920 + 9895e04
commit a7237dd
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 40 deletions.
diff --git a/.github/workflows/image-latest.yml b/.github/workflows/image-latest.yml
@@ -10,18 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: install buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: build the image
-        run: |
-          docker buildx build --push \
-            --tag mhzawadi/phpmyadmin:latest \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: mhzawadi/phpmyadmin:latest
diff --git a/.github/workflows/image-test.yml b/.github/workflows/image-test.yml
@@ -1,29 +1,25 @@
-name: build dev image
+name: build our image for dev
 
 on:
   workflow_dispatch:
   push:
-    branches-ignore: master
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron:  '5 3 * * 1'
+    branches: dev
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: install buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: build the image
-        run: |
-          docker buildx build --push \
-            --tag mhzawadi/phpmyadmin:dev \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: mhzawadi/phpmyadmin:dev
diff --git a/.github/workflows/image-version.yml b/.github/workflows/image-version.yml
@@ -11,14 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: install buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Prepare
         id: prepare
         run: |
@@ -27,7 +24,8 @@ jobs:
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: build the image
-        run: |
-          docker buildx build --push \
-            --tag "mhzawadi/phpmyadmin:${{ steps.prepare.outputs.version }}" \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: "mhzawadi/phpmyadmin:${{ steps.prepare.outputs.version }}"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 MAINTAINER Matthew Horwood <[email protected]>
 
 # Install required deb packages

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Run phpMyAdmin with Alpine, nginx and PHP FPM.
 
 ![GitHub Repo stars](https://img.shields.io/github/stars/mhzawadi/phpmyadmin?style=social)
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mhzawadi/phpmyadmin/build%20our%20image%20for%20latest?label=Docker%20Latest)
+[![Latest image](https://github.com/mhzawadi/phpmyadmin/actions/workflows/image-latest.yml/badge.svg)](https://github.com/mhzawadi/phpmyadmin/actions/workflows/image-latest.yml)
 ![Docker Pulls](https://img.shields.io/docker/pulls/mhzawadi/phpmyadmin.svg)
 ![Docker Stars](https://img.shields.io/docker/stars/mhzawadi/phpmyadmin.svg)