Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #333 from tobiasge/python-3.8 

Move default source image to Python 3.8
This commit is contained in:
Tobias Genannt 2020-09-01 15:35:17 +02:00 committed by GitHub
parent 79f0b997f3 32cef1dcf8
commit b33a509e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/push.yml vendored
View File

@ -18,10 +18,9 @@ jobs:
- ./build-next.sh - ./build-next.sh
- ./build.sh develop - ./build.sh develop
docker_from: docker_from:
- '' # use the default of the DOCKERFILE - '' # use the default of the build script
- python:3.7-alpine
- python:3.8-alpine - python:3.8-alpine
# - python:3.9-rc-alpine # disable until Netbox's unit tests work - python:3.9-rc-alpine
fail-fast: false fail-fast: false
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Builds new Netbox Docker Images name: Builds new Netbox Docker Images

4
build.sh
View File

@ -49,7 +49,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
echo " DOCKERFILE The name of Dockerfile to use." echo " DOCKERFILE The name of Dockerfile to use."
echo " Default: Dockerfile" echo " Default: Dockerfile"
echo " DOCKER_FROM The base image to use." echo " DOCKER_FROM The base image to use."
echo " Default: 'python:3.7-alpine'" echo " Default: 'python:3.8-alpine'"
echo " DOCKER_TARGET A specific target to build." echo " DOCKER_TARGET A specific target to build."
echo " It's currently not possible to pass multiple targets." echo " It's currently not possible to pass multiple targets."
echo " Default: main ldap" echo " Default: main ldap"
@ -157,7 +157,7 @@ fi
# Determining the value for DOCKER_FROM # Determining the value for DOCKER_FROM
### ###
if [ -z "$DOCKER_FROM" ]; then if [ -z "$DOCKER_FROM" ]; then
DOCKER_FROM="python:3.7-alpine" DOCKER_FROM="python:3.8-alpine"
fi fi
### ###