diff --git a/README.md b/README.md index e96eca1ec..cd2c8925e 100644 --- a/README.md +++ b/README.md @@ -995,10 +995,10 @@ SOFTWARE. [plex-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg [plex-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg [plex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg -[addon-portainer]: https://github.com/hassio-addons/addon-portainer/tree/b761137 -[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/b761137/README.md +[addon-portainer]: https://github.com/hassio-addons/addon-portainer/tree/78d9cdf +[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/78d9cdf/README.md [portainer-issue]: https://github.com/hassio-addons/addon-portainer/issues -[portainer-version-shield]: https://img.shields.io/badge/version-b761137-blue.svg +[portainer-version-shield]: https://img.shields.io/badge/version-78d9cdf-blue.svg [portainer-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/portainer-armhf.svg [portainer-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [portainer-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md index e55ec3f90..8ff7fffb7 100644 --- a/portainer/CHANGELOG.md +++ b/portainer/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog since v0.4.2 -2019/03/07 12:00 UTC - [b761137](https://github.com/hassio-addons/addon-portainer/commit/b761137a38e6d7e2b7985194b4a0651e29305ea5) by [@frenck](https://github.com/frenck) +2019/04/01 10:15 UTC - [78d9cdf](https://github.com/hassio-addons/addon-portainer/commit/78d9cdf78665be7365ce8db40ba24fcda83b3bb2) by [@frenck](https://github.com/frenck) +> :fire: Removes obsolete opt folder creation + +2019/04/01 10:15 UTC - [cd7ffdd](https://github.com/hassio-addons/addon-portainer/commit/cd7ffdd5f3363f8f0cd07c0d7ae802d9de11d081) by [@frenck](https://github.com/frenck) +> :hammer: Rewrite add-on onto Bashio + +2019/04/01 10:15 UTC - [31c277d](https://github.com/hassio-addons/addon-portainer/commit/31c277da6f49ae4fea453d701d22b78a20d16f4e) by [@frenck](https://github.com/frenck) +> :ambulance: Fixes incorrect add-on config json + +2019/04/01 10:15 UTC - [adefb5e](https://github.com/hassio-addons/addon-portainer/commit/adefb5e9b832cb72d56c0a5ea9273e1cfe4f1710) by [@frenck](https://github.com/frenck) +> :ambulance: Workaround Docker issue by reinstating legacy tags + +2019/04/01 10:15 UTC - [2281cf0](https://github.com/hassio-addons/addon-portainer/commit/2281cf00727413a940a1f54e15f61c0bad8736ad) by [@frenck](https://github.com/frenck) +> :hammer: Makes log_level optional + +2019/04/01 10:15 UTC - [1720636](https://github.com/hassio-addons/addon-portainer/commit/1720636addfcb69ca4da762076324196c813583f) by [@frenck](https://github.com/frenck) +> :fire: Removes custom log format override + +2019/04/01 10:15 UTC - [38b814a](https://github.com/hassio-addons/addon-portainer/commit/38b814ab82e81cb0074c6cc8ebc05e4c9790aa52) by [@frenck](https://github.com/frenck) +> :sparkles: Adds ARMv7 support + +2019/04/01 10:15 UTC - [b1f0195](https://github.com/hassio-addons/addon-portainer/commit/b1f0195c0a76733b04f399d1e22c16d12e657d39) by [@frenck](https://github.com/frenck) +> :arrow_up: Upgrades add-on base image to 3.0.1 + +2019/04/01 10:15 UTC - [d854948](https://github.com/hassio-addons/addon-portainer/commit/d854948ab825595318ce944f5cff04202856a880) by [@niksy111](https://github.com/niksy111) +> Replaced "thus" with "this" (#14) + +I replaced "thus" with "this". + +2019/04/01 10:15 UTC - [b761137](https://github.com/hassio-addons/addon-portainer/commit/b761137a38e6d7e2b7985194b4a0651e29305ea5) by [@frenck](https://github.com/frenck) > :arrow_up: Upgrades add-on base image to 2.3.2 diff --git a/portainer/README.md b/portainer/README.md index 4d7f11090..c1a940b98 100644 --- a/portainer/README.md +++ b/portainer/README.md @@ -53,13 +53,13 @@ If you are more interested in stable releases of our add-ons: [buymeacoffee]: https://www.buymeacoffee.com/frenck [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons -[docs]: https://github.com/hassio-addons/addon-portainer/blob/b761137/README.md +[docs]: https://github.com/hassio-addons/addon-portainer/blob/78d9cdf/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-portainer/68836?u=frenck [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg [patreon-shield]: https://www.frenck.nl/images/patreon.png [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg -[release-shield]: https://img.shields.io/badge/version-b761137-blue.svg -[release]: https://github.com/hassio-addons/addon-portainer/tree/b761137 +[release-shield]: https://img.shields.io/badge/version-78d9cdf-blue.svg +[release]: https://github.com/hassio-addons/addon-portainer/tree/78d9cdf [screenshot]: https://github.com/hassio-addons/addon-portainer/raw/master/images/screenshot.png \ No newline at end of file diff --git a/portainer/config.json b/portainer/config.json index 8e9991629..39b717745 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -1,6 +1,6 @@ { "name": "Portainer", - "version": "b761137", + "version": "78d9cdf", "slug": "portainer", "description": "Manage your Docker environment with ease", "url": "https://github.com/hassio-addons/addon-portainer", @@ -9,7 +9,8 @@ "arch": [ "aarch64", "amd64", - "armhf" + "armhf", + "armv7" ], "map": [ "config", @@ -23,22 +24,18 @@ "hassio_role": "default", "docker_api": true, "options": { - "log_level": "info", "ssl": true, "certfile": "fullchain.pem", "keyfile": "privkey.pem", "hide_hassio_containers": true }, "schema": { - "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)", + "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", "ssl": "bool", "certfile": "str", "keyfile": "str", "hide_hassio_containers": "bool", "leave_front_door_open": "bool?" }, - "environment": { - "LOG_FORMAT": "{LEVEL}: {MESSAGE}" - }, - "image": "hassioaddons/portainer" + "image": "hassioaddons/portainer-{arch}" } \ No newline at end of file