diff --git a/README.md b/README.md index 92b699565..2ffeff67e 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/78d9cdf -[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/78d9cdf/README.md +[addon-portainer]: https://github.com/hassio-addons/addon-portainer/tree/95d59f7 +[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/95d59f7/README.md [portainer-issue]: https://github.com/hassio-addons/addon-portainer/issues -[portainer-version-shield]: https://img.shields.io/badge/version-78d9cdf-blue.svg +[portainer-version-shield]: https://img.shields.io/badge/version-95d59f7-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 8ff7fffb7..3235c2034 100644 --- a/portainer/CHANGELOG.md +++ b/portainer/CHANGELOG.md @@ -1,34 +1,17 @@ -# Changelog since v0.4.2 +# Changelog since v0.5.0 -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/13 20:59 UTC - [95d59f7](https://github.com/hassio-addons/addon-portainer/commit/95d59f79cbf926a56cfd64caee8fdc88b8df028e) by [@frenck](https://github.com/frenck) +> :books: Removes obsolete iframe URL section from README -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/13 20:59 UTC - [4baa71a](https://github.com/hassio-addons/addon-portainer/commit/4baa71ac9d88f1117a8f917bdde427ecc51f2b78) by [@frenck](https://github.com/frenck) +> :fire: Removes hide_hassio_containers option from add-on -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/13 20:59 UTC - [8da75f1](https://github.com/hassio-addons/addon-portainer/commit/8da75f19ef2eda4a376e5ace69c4b8e8f4d31d95) by [@frenck](https://github.com/frenck) +> :hammer: Improves S6 finish scripts -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/13 20:59 UTC - [800dd19](https://github.com/hassio-addons/addon-portainer/commit/800dd1911f5596b043ac5f79954068c553a2b2b4) by [@frenck](https://github.com/frenck) +> :sparkles: Adds Hassio Ingress support -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 +2019/04/13 20:59 UTC - [824e917](https://github.com/hassio-addons/addon-portainer/commit/824e9170ce183b1bfd2a009891635fd5a1d98480) by [@frenck](https://github.com/frenck) +> :arrow_up: Upgrades base image to v3.1.0 diff --git a/portainer/README.md b/portainer/README.md index c1a940b98..b7953e2fc 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/78d9cdf/README.md +[docs]: https://github.com/hassio-addons/addon-portainer/blob/95d59f7/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-78d9cdf-blue.svg -[release]: https://github.com/hassio-addons/addon-portainer/tree/78d9cdf +[release-shield]: https://img.shields.io/badge/version-95d59f7-blue.svg +[release]: https://github.com/hassio-addons/addon-portainer/tree/95d59f7 [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 39b717745..5a3c26d05 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -1,10 +1,12 @@ { "name": "Portainer", - "version": "78d9cdf", + "version": "95d59f7", "slug": "portainer", "description": "Manage your Docker environment with ease", "url": "https://github.com/hassio-addons/addon-portainer", "webui": "[PROTO:ssl]://[HOST]:[PORT:9000]", + "ingress": true, + "ingress_port": 1337, "startup": "services", "arch": [ "aarch64", @@ -17,24 +19,26 @@ "ssl" ], "ports": { - "9000/tcp": 9000 + "80/tcp": null + }, + "ports_description": { + "80/tcp": "Web interface (Not required for Hass.io Ingress)" }, "boot": "auto", "hassio_api": true, "hassio_role": "default", + "auth_api": true, "docker_api": true, "options": { "ssl": true, "certfile": "fullchain.pem", - "keyfile": "privkey.pem", - "hide_hassio_containers": true + "keyfile": "privkey.pem" }, "schema": { "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?" }, "image": "hassioaddons/portainer-{arch}"