Skip to content

Commit 4a4debf

Browse files
cytopiacytopia
authored
Merge pull request #17 from devilbox/release-0.15
Release 0.15
2 parents 2d8d4fa + a95cda8 commit 4a4debf

File tree

5 files changed

+25
-43
lines changed

5 files changed

+25
-43
lines changed

‎.github/workflows/action_branch.yml

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
with:
2727
enabled: true
2828
can_deploy: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-') }}
29-
name: ${{ needs.params.outputs.name }}
3029
matrix: ${{ needs.params.outputs.matrix }}
3130
refs: ${{ needs.params.outputs.refs }}
3231
secrets:

‎.github/workflows/action_pull_request.yml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
with:
2929
enabled: true
3030
can_deploy: false
31-
name: ${{ needs.params.outputs.name }}
3231
matrix: ${{ needs.params.outputs.matrix }}
3332
refs: ${{ needs.params.outputs.refs }}
3433
secrets:

‎.github/workflows/action_schedule.yml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
with:
2929
enabled: true
3030
can_deploy: true
31-
name: ${{ needs.params.outputs.name }}
3231
matrix: ${{ needs.params.outputs.matrix }}
3332
refs: ${{ needs.params.outputs.refs }}
3433
secrets:

‎.github/workflows/params.yml

+1-16
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ name: params
1010
# Custom Variables
1111
# -------------------------------------------------------------------------------------------------
1212
env:
13-
NAME: MySQL
1413
MATRIX: >-
1514
[
1615
{
@@ -30,7 +29,7 @@ env:
3029
},
3130
{
3231
"NAME": "mariadb",
33-
"VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6"],
32+
"VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6", "10.7", "10.8"],
3433
"ARCH": ["linux/amd64", "linux/arm64"]
3534
},
3635
{
@@ -47,9 +46,6 @@ env:
4746
on:
4847
workflow_call:
4948
outputs:
50-
name:
51-
description: "The project name"
52-
value: ${{ jobs.params.outputs.name }}
5349
matrix:
5450
description: "The determined version matrix"
5551
value: ${{ jobs.params.outputs.matrix }}
@@ -62,16 +58,10 @@ jobs:
6258
runs-on: ubuntu-latest
6359

6460
outputs:
65-
name: ${{ steps.set-name.outputs.name }}
6661
matrix: ${{ steps.set-matrix.outputs.matrix }}
6762
refs: ${{ steps.set-refs.outputs.matrix }}
6863

6964
steps:
70-
- name: "Set Name"
71-
id: set-name
72-
run: |
73-
echo '::set-output name=name::${{ env.NAME }}'
74-
7565
- name: "[Set-Output] Matrix"
7666
id: set-matrix
7767
run: |
@@ -88,11 +78,6 @@ jobs:
8878

8979
- name: "[DEBUG] Show settings'"
9080
run: |
91-
echo 'Name'
92-
echo '--------------------'
93-
echo '${{ steps.set-name.outputs.name }}'
94-
echo
95-
9681
echo 'Matrix'
9782
echo '--------------------'
9883
echo '${{ steps.set-matrix.outputs.matrix }}'

‎README.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -97,42 +97,42 @@ For retagged information see below.
9797
* [DockerHub](https://hub.docker.com/_/mysql)
9898
* [GitHub](https://github.com/docker-library/mysql)
9999

100-
| Original Image and Tag | New Image and Tag |
101-
|------------------------|-------------------------------|
102-
| `mysql:5.5` | `devilbox/mysql:mysql-5.5` |
103-
| `mysql:5.6` | `devilbox/mysql:mysql-5.6` |
104-
| `mysql:5.7` | `devilbox/mysql:mysql-5.7` |
105-
| `mysql:8.0` | `devilbox/mysql:mysql-8.0` |
100+
| Original Image and Tag | New Image and Tag | Available platforms |
101+
|------------------------|-------------------------------|---------------------|
102+
| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | `amd64` |
103+
| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | `amd64` |
104+
| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | `amd64` |
105+
| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | `amd64`, `arm64` |
106106

107107
#### MariaDB
108108

109109
* [DockerHub](https://hub.docker.com/_/mariadb)
110110
* [GitHub](https://github.com/docker-library/mariadb)
111111

112-
| Original Image and Tag | New Image and Tag |
113-
|------------------------|-------------------------------|
114-
| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` |
115-
| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` |
116-
| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` |
117-
| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` |
118-
| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` |
119-
| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` |
120-
| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` |
121-
| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` |
122-
| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` |
123-
| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` |
112+
| Original Image and Tag | New Image and Tag | Available platforms |
113+
|------------------------|-------------------------------|---------------------|
114+
| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | `amd64` |
115+
| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | `amd64` |
116+
| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | `amd64`, `arm64` |
117+
| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | `amd64`, `arm64` |
118+
| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | `amd64`, `arm64` |
119+
| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | `amd64`, `arm64` |
120+
| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | `amd64`, `arm64` |
121+
| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | `amd64`, `arm64` |
122+
| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | `amd64`, `arm64` |
123+
| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | `amd64`, `arm64` |
124124

125125
#### Percona
126126

127127
* [DockerHub](https://hub.docker.com/_/percona)
128128
* [GitHub](https://github.com/docker-library/percona)
129129

130-
| Original Image and Tag | New Image and Tag |
131-
|------------------------|-------------------------------|
132-
| `percona:5.5` | `devilbox/mysql:percona-5.5` |
133-
| `percona:5.6` | `devilbox/mysql:percona-5.6` |
134-
| `percona:5.7` | `devilbox/mysql:percona-5.7` |
135-
| `percona:8.0` | `devilbox/mysql:percona-8.0` |
130+
| Original Image and Tag | New Image and Tag | Available platforms |
131+
|------------------------|-------------------------------|---------------------|
132+
| `percona:5.5` | `devilbox/mysql:percona-5.5` | `amd64` |
133+
| `percona:5.6` | `devilbox/mysql:percona-5.6` | `amd64` |
134+
| `percona:5.7` | `devilbox/mysql:percona-5.7` | `amd64` |
135+
| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` |
136136

137137

138138
## License

0 commit comments

Comments
 (0)