dmoonfire/dosage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

Jenkins: Always use Debian buster as base

Browse source
This commit is contained in:
Tobias Gruetzmacher 2019-07-14 12:58:05 +02:00
parent 7bb0605329
commit 3e8f90c159
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jenkinsfile vendored
View file

@ -1,8 +1,8 @@
def pys = [ def pys = [
[name: 'Python 3.7', docker:'python:3.7-stretch', tox:'py37,flake8', main: true], [name: 'Python 3.7', docker:'python:3.7-buster', tox:'py37,flake8', main: true],
[name: 'Python 3.6', docker:'python:3.6-stretch', tox:'py36', main: false], [name: 'Python 3.6', docker:'python:3.6-buster', tox:'py36', main: false],
[name: 'Python 3.5', docker:'python:3.5-jessie', tox:'py35', main: false], [name: 'Python 3.5', docker:'python:3.5-buster', tox:'py35', main: false],
[name: 'Python 2.7', docker:'python:2.7-stretch', tox:'py27', main: false] [name: 'Python 2.7', docker:'python:2.7-buster', tox:'py27', main: false]
] ]
properties([ properties([
@ -79,10 +79,6 @@ timestamps {
def buildDockerfile(image) { def buildDockerfile(image) {
def uid = sh(returnStdout: true, script: 'id -u').trim() def uid = sh(returnStdout: true, script: 'id -u').trim()
def toxInst = 'apt-get update && apt-get -y install tox' def toxInst = 'apt-get update && apt-get -y install tox'
if (image.contains('jessie')) {
toxInst = 'pip install tox' // Dirty!
}
writeFile file: 'Dockerfile', text: """ writeFile file: 'Dockerfile', text: """
FROM $image FROM $image
RUN $toxInst RUN $toxInst