From 30a98c500987fe654c1cd96b86b22146e5f04f82 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Mon, 26 Oct 2020 16:25:38 +0100
Subject: [PATCH 1/2] Upgrade Python image to 3.9-alpine

Upgrade the default base image to Python 3.9 and start testing on Python 3.10-rc
---
 .github/workflows/push.yml | 3 +--
 build.sh                   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 50d17e9..3d2c687 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -19,8 +19,7 @@ jobs:
         - ./build.sh develop
         docker_from:
         - '' # use the default of the build script
-        - python:3.8-alpine
-        - python:3.9-alpine
+        - python:3.10-rc-alpine
       fail-fast: false
     runs-on: ubuntu-latest
     name: Builds new Netbox Docker Images
diff --git a/build.sh b/build.sh
index 360f08c..19c56c8 100755
--- a/build.sh
+++ b/build.sh
@@ -49,7 +49,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
   echo "  DOCKERFILE  The name of Dockerfile to use."
   echo "              Default: Dockerfile"
   echo "  DOCKER_FROM The base image to use."
-  echo "              Default: 'python:3.8-alpine'"
+  echo "              Default: 'python:3.9-alpine'"
   echo "  DOCKER_TARGET A specific target to build."
   echo "              It's currently not possible to pass multiple targets."
   echo "              Default: main ldap"
@@ -157,7 +157,7 @@ fi
 # Determining the value for DOCKER_FROM
 ###
 if [ -z "$DOCKER_FROM" ]; then
-  DOCKER_FROM="python:3.8-alpine"
+  DOCKER_FROM="python:3.9-alpine"
 fi
 
 ###

From bb2ac7bd717a3ee345f3ff4216221a813bb7b9d4 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Mon, 26 Oct 2020 16:47:38 +0100
Subject: [PATCH 2/2] Disable tests for Python 3.10-rc

Some of the dependencies of Netbox can't be built with Python 3.10.
---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 3d2c687..e1780b7 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -19,7 +19,7 @@ jobs:
         - ./build.sh develop
         docker_from:
         - '' # use the default of the build script
-        - python:3.10-rc-alpine
+        # - python:3.10-rc-alpine # disable until dependencies work
       fail-fast: false
     runs-on: ubuntu-latest
     name: Builds new Netbox Docker Images