diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b98d176..75296be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,18 @@ -name: phpMyAdmin / Addon +name: phpMyAdmin / App on: push: branches: - - main + - master workflow_dispatch: +permissions: + contents: write + discussions: write + +env: + IMAGE_NAME: phpmyadmin-addon + jobs: changes: name: Config / Changed @@ -32,6 +39,7 @@ jobs: version: ${{ steps.yaml.outputs.version }} architectures: ${{ steps.info.outputs.architectures }} description: ${{ steps.desc.outputs.description }} + matrix: ${{ steps.matrix.outputs.matrix }} steps: - name: Git Checkout uses: actions/checkout@v6 @@ -48,7 +56,7 @@ jobs: with: file_path: ./phpmyadmin/config.yaml - - name: Get Addon Information + - name: Get App Information id: info uses: home-assistant/actions/helpers/info@master with: @@ -60,31 +68,45 @@ jobs: echo "description="$(cat CHANGELOG.md | awk '/^##/{if(++i>1)exit} i' | awk '{if(NR>1)print}')"" >> $GITHUB_OUTPUT working-directory: ./phpmyadmin + - name: Get build matrix + id: matrix + uses: home-assistant/builder/actions/prepare-multi-arch-matrix@2026.03.2 + with: + architectures: ${{ steps.info.outputs.architectures }} + image-name: ${{ env.IMAGE_NAME }} + test: - name: Test / Build + name: Test / Build ${{ matrix.arch }} if: ${{ needs.changes.outputs.changes == 'true' }} needs: - changes - init - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false - matrix: - arch: ${{ fromJson(needs.init.outputs.architectures) }} + matrix: ${{ fromJSON(needs.init.outputs.matrix) }} + permissions: + contents: read + id-token: write + packages: write steps: - name: Git Checkout uses: actions/checkout@v6 - - name: Test Build - uses: home-assistant/builder@master + - name: Build Test Image + uses: home-assistant/builder/actions/build-image@2026.03.2 with: - args: | - --test \ - --${{ matrix.arch }} \ - --target phpmyadmin \ - --docker-hub "ghcr.io/${{ github.repository_owner }}" \ - --image "phpmyadmin-addon-{arch}" \ - --addon + arch: ${{ matrix.arch }} + image: ${{ matrix.image }} + version: ${{ needs.init.outputs.version }} + image-tags: | + ${{ needs.init.outputs.version }} + latest + push: false + cosign: false + cache-gha: false + context: ./phpmyadmin + container-registry-password: ${{ secrets.GITHUB_TOKEN }} docker: name: Docker @@ -96,6 +118,7 @@ jobs: permissions: contents: read packages: write + id-token: write secrets: inherit release: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1435de7..9147321 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,13 +4,19 @@ on: workflow_call: workflow_dispatch: +env: + IMAGE_NAME: phpmyadmin-addon + jobs: init: - name: Addon / Init + name: App / Init runs-on: ubuntu-latest outputs: version: ${{ steps.yaml.outputs.version }} architectures: ${{ steps.info.outputs.architectures }} + matrix: ${{ steps.matrix.outputs.matrix }} + permissions: + contents: read steps: - name: Git Checkout uses: actions/checkout@v6 @@ -21,41 +27,66 @@ jobs: with: file_path: ${{ github.workspace }}/phpmyadmin/config.yaml - - name: Get Addon Information + - name: Get App Information id: info uses: home-assistant/actions/helpers/info@master with: path: "./phpmyadmin" + - name: Get build matrix + id: matrix + uses: home-assistant/builder/actions/prepare-multi-arch-matrix@2026.03.2 + with: + architectures: ${{ steps.info.outputs.architectures }} + image-name: ${{ env.IMAGE_NAME }} + docker: - name: Docker / Build + name: Docker / Build ${{ matrix.arch }} needs: - init - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false - matrix: - arch: ${{ fromJson(needs.init.outputs.architectures) }} + matrix: ${{ fromJSON(needs.init.outputs.matrix) }} permissions: contents: read + id-token: write packages: write steps: - name: Git Checkout uses: actions/checkout@v6 - - name: Login to GitHub Container Registry - uses: docker/login-action@v4 + - name: Build Test Image + uses: home-assistant/builder/actions/build-image@2026.03.2 with: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io + arch: ${{ matrix.arch }} + image: ${{ matrix.image }} + version: ${{ needs.init.outputs.version }} + image-tags: | + ${{ needs.init.outputs.version }} + latest + push: true + cosign: true + cache-gha: false + context: ./phpmyadmin + container-registry-password: ${{ secrets.GITHUB_TOKEN }} - - name: Build - uses: home-assistant/builder@master + manifest: + name: Publish multi-arch manifest + needs: + - init + - docker + runs-on: ubuntu-latest + permissions: + id-token: write + packages: write + steps: + - name: Publish multi-arch manifest + uses: home-assistant/builder/actions/publish-multi-arch-manifest@2026.03.2 with: - args: | - --${{ matrix.arch }} \ - --target phpmyadmin \ - --docker-hub "ghcr.io/${{ github.repository_owner }}" \ - --image "phpmyadmin-addon-{arch}" \ - --addon + architectures: ${{ needs.init.outputs.architectures }} + container-registry-password: ${{ secrets.GITHUB_TOKEN }} + image-name: ${{ env.IMAGE_NAME }} + image-tags: | + ${{ needs.init.outputs.version }} + latest diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ec34b48..42baa0a 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -7,7 +7,7 @@ on: jobs: information: - name: ℹ️ Gather add-on information + name: ℹ️ Gather App information runs-on: ubuntu-latest outputs: architectures: ${{ steps.information.outputs.architectures }} @@ -20,10 +20,12 @@ jobs: slug: ${{ steps.information.outputs.slug }} target: ${{ steps.information.outputs.target }} version: ${{ steps.version.outputs.version }} + permissions: + contents: read steps: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v6 - - name: 🚀 Run add-on information action + - name: 🚀 Run App information action id: information uses: andrewjswan/home-assistant-addons/helpers/info@main - name: ℹ️ Gather version and environment @@ -42,10 +44,12 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" publish: - name: 📢 Publish Add-on + name: 📢 Publish App runs-on: ubuntu-latest needs: - information + permissions: + contents: write steps: - name: 🚀 Dispatch Repository Updater update signal uses: peter-evans/repository-dispatch@v4 diff --git a/README.md b/README.md index 3af07c6..0466056 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ -# phpMyAdmin Add-on +
+

Home Assistant App: phpMyAdmin

+
## General -[![ha addon_badge](https://img.shields.io/badge/HA-Addon-blue.svg)](https://developers.home-assistant.io/docs/add-ons) +[![ha app_badge](https://img.shields.io/badge/HA-App-blue.svg)](https://developers.home-assistant.io/docs/add-ons) [![phpmyadmin](https://img.shields.io/badge/phpMy-Admin-blue.svg)](https://github.com/andrewjswan/phpmyadmin-addon/) [![GitHub](https://img.shields.io/github/license/andrewjswan/phpmyadmin-addon?color=blue)](https://github.com/andrewjswan/phpmyadmin-addon/blob/master/LICENSE) [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/andrewjswan/phpmyadmin-addon?include_prereleases)](https://github.com/andrewjswan/phpmyadmin-addon/blob/main/phpmyadmin/CHANGELOG.md) @@ -29,7 +31,7 @@ while you still have the ability to directly execute any SQL statement. ## Notes -Addon based on offical [Home Assistant Community Add-on: phpMyAdmin][phpmyadmin] by [Franck Nijhof][frenck]. +App based on offical [Home Assistant Community App: phpMyAdmin][phpmyadmin] by [Franck Nijhof][frenck]. [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg @@ -38,4 +40,4 @@ Addon based on offical [Home Assistant Community Add-on: phpMyAdmin][phpmyadmin] [i386-shield]: https://img.shields.io/badge/i386-no-red.svg [screenshot]: https://raw.githubusercontent.com/hassio-addons/addon-phpmyadmin/main/images/screenshot.png [frenck]: https://github.com/frenck -[phpmyadmin]: https://github.com/hassio-addons/phpmyadmin-addon +[phpmyadmin]: https://github.com/hassio-addons/addon-phpmyadmin diff --git a/phpmyadmin/CHANGELOG.md b/phpmyadmin/CHANGELOG.md index 24e4320..3ccb152 100644 --- a/phpmyadmin/CHANGELOG.md +++ b/phpmyadmin/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2026.4.1 - 2026-04-14 + +- Migrate to HA App system + ## 2026.11.1 - 2025-11-16 - Remove deprecated `codenotary` fields diff --git a/phpmyadmin/DOCS.md b/phpmyadmin/DOCS.md index a373e88..0735896 100644 --- a/phpmyadmin/DOCS.md +++ b/phpmyadmin/DOCS.md @@ -1,4 +1,4 @@ -# phpMyAdmin Add-on +# Home Assistant App: phpMyAdmin phpMyAdmin is a database administration tool for MariaDB & MySQL. Frequently used operations (managing databases, tables, columns, relations, indexes, @@ -7,19 +7,19 @@ while you still have the ability to directly execute any SQL statement. ## Installation -Add the repository URL under **Supervisor → Add-on Store** in your Home Assistant front-end: +Add the repository URL under **Supervisor → App Store** in your Home Assistant front-end: https://github.com/andrewjswan/phpmyadmin-addon/ -1. Click the "Install" button to install the add-on. -1. Start the "phpMyAdmin" add-on. -1. Enjoy the add-on! +1. Click the "Install" button to install the app. +1. Start the "phpMyAdmin" app. +1. Enjoy the app! ## Configuration -**Note**: _Remember to restart the add-on when the configuration is changed._ +**Note**: _Remember to restart the app when the configuration is changed._ -Example add-on configuration: +Example app configuration: ```yaml log_level: info @@ -29,7 +29,7 @@ log_level: info ### Option: `host` -IP Address or Hostname of the SQL server. If not specified, the local MariaDB add-on is used. +IP Address or Hostname of the SQL server. If not specified, the local MariaDB app is used. ### Option: `port` @@ -50,7 +50,7 @@ By default, the size limit for uploads (for operations such as imports) is set t ### Option: `log_level` -The `log_level` option controls the level of log output by the addon and can +The `log_level` option controls the level of log output by the app and can be changed to be more or less verbose, which might be useful when you are dealing with an unknown issue. Possible values are: @@ -59,7 +59,7 @@ dealing with an unknown issue. Possible values are: - `info`: Normal (usually) interesting events. - `warning`: Exceptional occurrences that are not errors. - `error`: Runtime errors that do not require immediate action. -- `fatal`: Something went terribly wrong. Add-on becomes unusable. +- `fatal`: Something went terribly wrong. App becomes unusable. Please note that each level automatically includes log messages from a more severe level, e.g., `debug` also shows `info` messages. By default, @@ -76,13 +76,13 @@ You could also [open an issue here][issue] GitHub. The original setup of this repository is by [Andrew J.Swan][andrewjswan]. -Addon based on offical [Home Assistant Community Add-on: phpMyAdmin][phpmyadmin] by [Franck Nijhof][frenck]. +App based on offical [Home Assistant Community App: phpMyAdmin][phpmyadmin] by [Franck Nijhof][frenck]. ## License MIT License -Copyright (c) 2024 Andrew J.Swan +Copyright (c) Andrew J.Swan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -107,4 +107,4 @@ SOFTWARE. [andrewjswan]: https://github.com/andrewjswan [issue]: https://github.com/andrewjswan/phpmyadmin-addon/issues [frenck]: https://github.com/frenck -[phpmyadmin]: https://github.com/hassio-addons/addon-phpmyadmin \ No newline at end of file +[phpmyadmin]: https://github.com/hassio-addons/addon-phpmyadmin diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile index 2641981..1912495 100644 --- a/phpmyadmin/Dockerfile +++ b/phpmyadmin/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM +ARG BUILD_FROM=ghcr.io/hassio-addons/phpmyadmin/aarch64:stable FROM ${BUILD_FROM} # Copy root filesystem @@ -18,7 +18,7 @@ LABEL \ io.hass.name="${BUILD_NAME}" \ io.hass.description="${BUILD_DESCRIPTION}" \ io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ + io.hass.type="app" \ io.hass.version=${BUILD_VERSION} \ maintainer="Andrew J.Swan " \ org.opencontainers.image.title="${BUILD_NAME}" \ diff --git a/phpmyadmin/README.md b/phpmyadmin/README.md index 8be05b2..0466056 100644 --- a/phpmyadmin/README.md +++ b/phpmyadmin/README.md @@ -1,8 +1,10 @@ -# phpMyAdmin Add-on +
+

Home Assistant App: phpMyAdmin

+
## General -[![ha addon_badge](https://img.shields.io/badge/HA-Addon-blue.svg)](https://developers.home-assistant.io/docs/add-ons) +[![ha app_badge](https://img.shields.io/badge/HA-App-blue.svg)](https://developers.home-assistant.io/docs/add-ons) [![phpmyadmin](https://img.shields.io/badge/phpMy-Admin-blue.svg)](https://github.com/andrewjswan/phpmyadmin-addon/) [![GitHub](https://img.shields.io/github/license/andrewjswan/phpmyadmin-addon?color=blue)](https://github.com/andrewjswan/phpmyadmin-addon/blob/master/LICENSE) [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/andrewjswan/phpmyadmin-addon?include_prereleases)](https://github.com/andrewjswan/phpmyadmin-addon/blob/main/phpmyadmin/CHANGELOG.md) @@ -29,7 +31,7 @@ while you still have the ability to directly execute any SQL statement. ## Notes -Addon based on offical [Home Assistant Community Add-on: phpMyAdmin][phpmyadmin] by [Franck Nijhof][frenck]. +App based on offical [Home Assistant Community App: phpMyAdmin][phpmyadmin] by [Franck Nijhof][frenck]. [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg diff --git a/phpmyadmin/build.yaml b/phpmyadmin/build.yaml deleted file mode 100644 index cb9d208..0000000 --- a/phpmyadmin/build.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -build_from: - aarch64: ghcr.io/hassio-addons/phpmyadmin/aarch64:stable - amd64: ghcr.io/hassio-addons/phpmyadmin/amd64:stable diff --git a/phpmyadmin/config.yaml b/phpmyadmin/config.yaml index e801c1e..562e57e 100644 --- a/phpmyadmin/config.yaml +++ b/phpmyadmin/config.yaml @@ -1,6 +1,6 @@ --- name: phpMyAdmin -version: 2025.11.1 +version: 2026.4.1 slug: phpmyadmin description: A web interface for the MariaDB / MySQL url: https://github.com/andrewjswan/phpmyadmin-addon @@ -9,7 +9,7 @@ arch: - aarch64 - amd64 -image: ghcr.io/andrewjswan/phpmyadmin-addon-{arch} +image: ghcr.io/andrewjswan/phpmyadmin-addon ingress: true ingress_stream: true diff --git a/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/init-phpmyadmin/run b/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/init-phpmyadmin/run index 5792c7e..75cecb3 100644 --- a/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/init-phpmyadmin/run +++ b/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/init-phpmyadmin/run @@ -1,7 +1,7 @@ #!/command/with-contenv bashio # shellcheck shell=bash # ============================================================================== -# Home Assistant Community Add-on: phpMyAdmin +# Home Assistant Community App: phpMyAdmin # Configures phpMyAdmin # ============================================================================== declare host diff --git a/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run b/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run index ef16027..e93e685 100644 --- a/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run +++ b/phpmyadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run @@ -1,7 +1,7 @@ #!/command/with-contenv bashio # shellcheck shell=bash # ============================================================================== -# Home Assistant Community Add-on: phpMyAdmin +# Home Assistant Community App: phpMyAdmin # Runs the PHP-FPM daemon # ============================================================================== bashio::log.info "Starting PHP-FPM..." diff --git a/phpmyadmin/translations/en.yaml b/phpmyadmin/translations/en.yaml index 1b62750..efda599 100644 --- a/phpmyadmin/translations/en.yaml +++ b/phpmyadmin/translations/en.yaml @@ -3,7 +3,7 @@ configuration: host: name: Host description: >- - IP Address or Hostname of the SQL server. If not specified, the local MariaDB add-on is used. + IP Address or Hostname of the SQL server. If not specified, the local MariaDB App is used. port: name: Port description: >- @@ -19,4 +19,4 @@ configuration: log_level: name: Log level description: >- - Controls the level of log details the add-on provides. + Controls the level of log details the App provides. diff --git a/repository.json b/repository.json index e56fafa..31b1f45 100644 --- a/repository.json +++ b/repository.json @@ -1,5 +1,5 @@ { - "name": "phpMyAdmin Add-on by Andrew J.Swan", + "name": "phpMyAdmin App by Andrew J.Swan", "url": "https://github.com/andrewjswan/phpmyadmin-addon/", "maintainer": "Andrew J.Swan " } \ No newline at end of file