Skip to content

Commit a7237dd

Browse files
authored
Merge pull request #15 from mhzawadi/dev
Alpine v3.17 and Github actions
2 parents 8295920 + 9895e04 commit a7237dd

File tree

5 files changed

+32
-40
lines changed

5 files changed

+32
-40
lines changed

.github/workflows/image-latest.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: checkout code
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
- name: Set up QEMU
15-
uses: docker/setup-qemu-action@v1
16-
- name: install buildx
17-
id: buildx
18-
uses: docker/setup-buildx-action@v1
19-
- name: Available platforms
20-
run: echo ${{ steps.buildx.outputs.platforms }}
15+
uses: docker/setup-qemu-action@v2
16+
- name: Set up Docker Buildx
17+
uses: docker/setup-buildx-action@v2
2118
- name: login to docker hub
2219
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
2320
- name: build the image
24-
run: |
25-
docker buildx build --push \
26-
--tag mhzawadi/phpmyadmin:latest \
27-
--platform linux/amd64,linux/arm/v7,linux/arm64 .
21+
uses: docker/build-push-action@v3
22+
with:
23+
push: true
24+
platforms: linux/amd64,linux/arm64,linux/arm/v7
25+
tags: mhzawadi/phpmyadmin:latest

.github/workflows/image-test.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
1-
name: build dev image
1+
name: build our image for dev
22

33
on:
44
workflow_dispatch:
55
push:
6-
branches-ignore: master
7-
schedule:
8-
# * is a special character in YAML so you have to quote this string
9-
- cron: '5 3 * * 1'
6+
branches: dev
7+
108
jobs:
119
build:
1210
runs-on: ubuntu-latest
1311
steps:
1412
- name: checkout code
15-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1614
- name: Set up QEMU
17-
uses: docker/setup-qemu-action@v1
18-
- name: install buildx
19-
id: buildx
20-
uses: docker/setup-buildx-action@v1
21-
- name: Available platforms
22-
run: echo ${{ steps.buildx.outputs.platforms }}
15+
uses: docker/setup-qemu-action@v2
16+
- name: Set up Docker Buildx
17+
uses: docker/setup-buildx-action@v2
2318
- name: login to docker hub
2419
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
2520
- name: build the image
26-
run: |
27-
docker buildx build --push \
28-
--tag mhzawadi/phpmyadmin:dev \
29-
--platform linux/amd64,linux/arm/v7,linux/arm64 .
21+
uses: docker/build-push-action@v3
22+
with:
23+
push: true
24+
platforms: linux/amd64,linux/arm64,linux/arm/v7
25+
tags: mhzawadi/phpmyadmin:dev

.github/workflows/image-version.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: checkout code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515
- name: Set up QEMU
16-
uses: docker/setup-qemu-action@v1
17-
- name: install buildx
18-
id: buildx
19-
uses: docker/setup-buildx-action@v1
20-
- name: Available platforms
21-
run: echo ${{ steps.buildx.outputs.platforms }}
16+
uses: docker/setup-qemu-action@v2
17+
- name: Set up Docker Buildx
18+
uses: docker/setup-buildx-action@v2
2219
- name: Prepare
2320
id: prepare
2421
run: |
@@ -27,7 +24,8 @@ jobs:
2724
- name: login to docker hub
2825
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
2926
- name: build the image
30-
run: |
31-
docker buildx build --push \
32-
--tag "mhzawadi/phpmyadmin:${{ steps.prepare.outputs.version }}" \
33-
--platform linux/amd64,linux/arm/v7,linux/arm64 .
27+
uses: docker/build-push-action@v3
28+
with:
29+
push: true
30+
platforms: linux/amd64,linux/arm64,linux/arm/v7
31+
tags: "mhzawadi/phpmyadmin:${{ steps.prepare.outputs.version }}"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.16
1+
FROM alpine:3.17
22
MAINTAINER Matthew Horwood <matt@horwood.biz>
33

44
# Install required deb packages

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Run phpMyAdmin with Alpine, nginx and PHP FPM.
44

55
![GitHub Repo stars](https://img.shields.io/github/stars/mhzawadi/phpmyadmin?style=social)
6-
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/mhzawadi/phpmyadmin/build%20our%20image%20for%20latest?label=Docker%20Latest)
6+
[![Latest image](https://github.com/mhzawadi/phpmyadmin/actions/workflows/image-latest.yml/badge.svg)](https://github.com/mhzawadi/phpmyadmin/actions/workflows/image-latest.yml)
77
![Docker Pulls](https://img.shields.io/docker/pulls/mhzawadi/phpmyadmin.svg)
88
![Docker Stars](https://img.shields.io/docker/stars/mhzawadi/phpmyadmin.svg)
99

0 commit comments

Comments
 (0)