From 2f2483c298e7ed0fbf8930f94e8ceda4b4545431 Mon Sep 17 00:00:00 2001
From: alexbelgium <alexandre.pary@gmail.com>
Date: Tue, 18 May 2021 01:57:18 +0200
Subject: [PATCH] Update to 2.5.0

---
 portainer/CHANGELOG.md |  3 +++
 portainer/Dockerfile   |  2 +-
 portainer/config.json  | 15 +++++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md
index 978fb40d3..a88823ad2 100644
--- a/portainer/CHANGELOG.md
+++ b/portainer/CHANGELOG.md
@@ -1,3 +1,6 @@
+
+## 2.5.0 (18-05-2021)
+- Update to latest version from portainer/portainer
 - ssl
 - ingress with nginx 
 - password setting through addon option
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index a0295d448..f9f6dd45e 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -1,7 +1,7 @@
 ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.2.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
-ARG BUILD_UPSTREAM="2.1.1"
+ARG BUILD_UPSTREAM="2.5.0"
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/portainer/config.json b/portainer/config.json
index c5e72a73a..fa326f08d 100644
--- a/portainer/config.json
+++ b/portainer/config.json
@@ -1,7 +1,7 @@
 {
   "name": "Portainer",
-  "version": "2.1.1-dev4",
-  "upstream": "2.1.1",
+  "version": "2.5.0",
+  "upstream": "2.5.0",
   "slug": "portainer",
   "description": "Manage your Docker environment with ease",
   "url": "https://github.com/hassio-addons/addon-portainer",
@@ -11,9 +11,16 @@
   "startup": "services",
   "panel_icon": "mdi:docker",
   "homeassistant": "0.92.0b2",
-  "arch": ["aarch64", "amd64", "armhf", "armv7"],
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "armv7"
+  ],
   "init": false,
-  "map": ["ssl"],
+  "map": [
+    "ssl"
+  ],
   "ports": {
     "9000/tcp": 9000,
     "8000/tcp": null