diff --git a/.github/workflows/action_branch.yml b/.github/workflows/action_branch.yml index b102724..55d6950 100644 --- a/.github/workflows/action_branch.yml +++ b/.github/workflows/action_branch.yml @@ -26,7 +26,6 @@ jobs: with: enabled: true can_deploy: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-') }} - name: ${{ needs.params.outputs.name }} matrix: ${{ needs.params.outputs.matrix }} refs: ${{ needs.params.outputs.refs }} secrets: diff --git a/.github/workflows/action_pull_request.yml b/.github/workflows/action_pull_request.yml index a4e3e96..c80bf78 100644 --- a/.github/workflows/action_pull_request.yml +++ b/.github/workflows/action_pull_request.yml @@ -28,7 +28,6 @@ jobs: with: enabled: true can_deploy: false - name: ${{ needs.params.outputs.name }} matrix: ${{ needs.params.outputs.matrix }} refs: ${{ needs.params.outputs.refs }} secrets: diff --git a/.github/workflows/action_schedule.yml b/.github/workflows/action_schedule.yml index 80d3d38..36d979a 100644 --- a/.github/workflows/action_schedule.yml +++ b/.github/workflows/action_schedule.yml @@ -28,7 +28,6 @@ jobs: with: enabled: true can_deploy: true - name: ${{ needs.params.outputs.name }} matrix: ${{ needs.params.outputs.matrix }} refs: ${{ needs.params.outputs.refs }} secrets: diff --git a/.github/workflows/params.yml b/.github/workflows/params.yml index 03f347e..8ed2094 100644 --- a/.github/workflows/params.yml +++ b/.github/workflows/params.yml @@ -10,7 +10,6 @@ name: params # Custom Variables # ------------------------------------------------------------------------------------------------- env: - NAME: MySQL MATRIX: >- [ { @@ -30,7 +29,7 @@ env: }, { "NAME": "mariadb", - "VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6"], + "VERSION": ["10.1", "10.2", "10.3", "10.4", "10.5", "10.6", "10.7", "10.8"], "ARCH": ["linux/amd64", "linux/arm64"] }, { @@ -47,9 +46,6 @@ env: on: workflow_call: outputs: - name: - description: "The project name" - value: ${{ jobs.params.outputs.name }} matrix: description: "The determined version matrix" value: ${{ jobs.params.outputs.matrix }} @@ -62,16 +58,10 @@ jobs: runs-on: ubuntu-latest outputs: - name: ${{ steps.set-name.outputs.name }} matrix: ${{ steps.set-matrix.outputs.matrix }} refs: ${{ steps.set-refs.outputs.matrix }} steps: - - name: "Set Name" - id: set-name - run: | - echo '::set-output name=name::${{ env.NAME }}' - - name: "[Set-Output] Matrix" id: set-matrix run: | @@ -88,11 +78,6 @@ jobs: - name: "[DEBUG] Show settings'" run: | - echo 'Name' - echo '--------------------' - echo '${{ steps.set-name.outputs.name }}' - echo - echo 'Matrix' echo '--------------------' echo '${{ steps.set-matrix.outputs.matrix }}' diff --git a/README.md b/README.md index 6b14c12..2ae3573 100644 --- a/README.md +++ b/README.md @@ -97,42 +97,42 @@ For retagged information see below. * [DockerHub](https://hub.docker.com/_/mysql) * [GitHub](https://github.com/docker-library/mysql) -| Original Image and Tag | New Image and Tag | -|------------------------|-------------------------------| -| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | -| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | -| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | -| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | +| Original Image and Tag | New Image and Tag | Available platforms | +|------------------------|-------------------------------|---------------------| +| `mysql:5.5` | `devilbox/mysql:mysql-5.5` | `amd64` | +| `mysql:5.6` | `devilbox/mysql:mysql-5.6` | `amd64` | +| `mysql:5.7` | `devilbox/mysql:mysql-5.7` | `amd64` | +| `mysql:8.0` | `devilbox/mysql:mysql-8.0` | `amd64`, `arm64` | #### MariaDB * [DockerHub](https://hub.docker.com/_/mariadb) * [GitHub](https://github.com/docker-library/mariadb) -| Original Image and Tag | New Image and Tag | -|------------------------|-------------------------------| -| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | -| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | -| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | -| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | -| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | -| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | -| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | -| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | -| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | -| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | +| Original Image and Tag | New Image and Tag | Available platforms | +|------------------------|-------------------------------|---------------------| +| `mariadb:5.5` | `devilbox/mysql:mariadb-5.5` | `amd64` | +| `mariadb:10.0` | `devilbox/mysql:mariadb-10.0` | `amd64` | +| `mariadb:10.1` | `devilbox/mysql:mariadb-10.1` | `amd64`, `arm64` | +| `mariadb:10.2` | `devilbox/mysql:mariadb-10.2` | `amd64`, `arm64` | +| `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` | `amd64`, `arm64` | +| `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` | `amd64`, `arm64` | +| `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` | `amd64`, `arm64` | +| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` | `amd64`, `arm64` | +| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` | `amd64`, `arm64` | +| `mariadb:10.8` | `devilbox/mysql:mariadb-10.8` | `amd64`, `arm64` | #### Percona * [DockerHub](https://hub.docker.com/_/percona) * [GitHub](https://github.com/docker-library/percona) -| Original Image and Tag | New Image and Tag | -|------------------------|-------------------------------| -| `percona:5.5` | `devilbox/mysql:percona-5.5` | -| `percona:5.6` | `devilbox/mysql:percona-5.6` | -| `percona:5.7` | `devilbox/mysql:percona-5.7` | -| `percona:8.0` | `devilbox/mysql:percona-8.0` | +| Original Image and Tag | New Image and Tag | Available platforms | +|------------------------|-------------------------------|---------------------| +| `percona:5.5` | `devilbox/mysql:percona-5.5` | `amd64` | +| `percona:5.6` | `devilbox/mysql:percona-5.6` | `amd64` | +| `percona:5.7` | `devilbox/mysql:percona-5.7` | `amd64` | +| `percona:8.0` | `devilbox/mysql:percona-8.0` | `amd64` | ## License