From f108b79e83b605c9ba261e67b0d3f49d7ffa8500 Mon Sep 17 00:00:00 2001
From: Chaz Larson <chaz@chazlarson.com>
Date: Wed, 19 Jun 2024 08:50:23 -0500
Subject: [PATCH] [14] [13] Add nano to Docker image (#2122)

---
 .github/.wordlist.txt                 | 1 +
 .github/workflows/docker-develop.yml  | 2 +-
 .github/workflows/docker-latest.yml   | 2 +-
 .github/workflows/docker-nightly.yml  | 2 +-
 .github/workflows/docker-version.yml  | 2 +-
 .github/workflows/increment-build.yml | 2 +-
 .github/workflows/validate-pull.yml   | 2 +-
 CHANGELOG                             | 3 ++-
 Dockerfile                            | 2 +-
 VERSION                               | 2 +-
 requirements.txt                      | 4 ++--
 11 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index 293adfac..1c0b3831 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -227,6 +227,7 @@ portainer
 Powershell
 pre
 prepend
+psutil
 PUID
 puid
 QNAP
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index f5dda714..dbf0c80b 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
index b0682a47..13af2d98 100644
--- a/.github/workflows/docker-latest.yml
+++ b/.github/workflows/docker-latest.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
index 0e82c826..c360e9d8 100644
--- a/.github/workflows/docker-nightly.yml
+++ b/.github/workflows/docker-nightly.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
diff --git a/.github/workflows/docker-version.yml b/.github/workflows/docker-version.yml
index c9b24cbb..e637951c 100644
--- a/.github/workflows/docker-version.yml
+++ b/.github/workflows/docker-version.yml
@@ -38,7 +38,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
diff --git a/.github/workflows/increment-build.yml b/.github/workflows/increment-build.yml
index abf88b8d..c1ffc4e0 100644
--- a/.github/workflows/increment-build.yml
+++ b/.github/workflows/increment-build.yml
@@ -133,7 +133,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
diff --git a/.github/workflows/validate-pull.yml b/.github/workflows/validate-pull.yml
index a44d419c..0debed47 100644
--- a/.github/workflows/validate-pull.yml
+++ b/.github/workflows/validate-pull.yml
@@ -122,7 +122,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
diff --git a/CHANGELOG b/CHANGELOG
index 1744b0e7..8b7260bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 # Requirements Update (requirements will need to be reinstalled)
-Added tenacity requirement at 8.3.0
+Added tenacity requirement at 8.4.1
+Update psutil requirement to 6.0.0
 
 # Removed Features
 
diff --git a/Dockerfile b/Dockerfile
index b812eb5c..813ffc13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN echo "**** install system packages ****" \
  && apt-get update \
  && apt-get upgrade -y --no-install-recommends \
  && apt-get install -y tzdata --no-install-recommends \
- && apt-get install -y gcc g++ libxml2-dev libxslt-dev libz-dev libjpeg62-turbo-dev zlib1g-dev wget curl \
+ && apt-get install -y gcc g++ libxml2-dev libxslt-dev libz-dev libjpeg62-turbo-dev zlib1g-dev wget curl nano \
  && wget -O /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && chmod +x /tini \
  && pip3 install --no-cache-dir --upgrade --requirement /requirements.txt \
diff --git a/VERSION b/VERSION
index 86dcdc20..2725e514 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.2-build12
+2.0.2-build14
diff --git a/requirements.txt b/requirements.txt
index 2ddfd5e1..04d282db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,11 +5,11 @@ num2words==0.5.13
 pathvalidate==3.2.0
 pillow==10.3.0
 PlexAPI==4.15.13
-psutil==5.9.8
+psutil==6.0.0
 python-dotenv==1.0.1
 python-dateutil==2.9.0.post0
 requests==2.32.3
-tenacity==8.3.0
+tenacity==8.4.1
 ruamel.yaml==0.18.6
 schedule==1.2.2
 setuptools==70.0.0