ci: avoid apk installs in builder
This commit is contained in:
parent
2aa088a8cf
commit
e07e3c785f
9
Jenkinsfile
vendored
9
Jenkinsfile
vendored
@ -105,7 +105,6 @@ spec:
|
|||||||
container('builder') {
|
container('builder') {
|
||||||
sh '''
|
sh '''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
apk add --no-cache bash git jq
|
|
||||||
mkdir -p /root/.docker
|
mkdir -p /root/.docker
|
||||||
cp /docker-config/config.json /root/.docker/config.json
|
cp /docker-config/config.json /root/.docker/config.json
|
||||||
'''
|
'''
|
||||||
@ -116,19 +115,15 @@ spec:
|
|||||||
steps {
|
steps {
|
||||||
container('builder') {
|
container('builder') {
|
||||||
script {
|
script {
|
||||||
sh 'git config --global --add safe.directory /home/jenkins/agent/workspace/atlasbot'
|
|
||||||
def semver = sh(returnStdout: true, script: 'git describe --tags --exact-match || true').trim()
|
|
||||||
if (!semver) {
|
|
||||||
def base = sh(returnStdout: true, script: 'cat VERSION_BASE 2>/dev/null || true').trim()
|
def base = sh(returnStdout: true, script: 'cat VERSION_BASE 2>/dev/null || true').trim()
|
||||||
if (!base) {
|
if (!base) {
|
||||||
base = "0.1.0"
|
base = "0.1.0"
|
||||||
}
|
}
|
||||||
def buildNum = env.BUILD_NUMBER?.trim()
|
def buildNum = env.BUILD_NUMBER?.trim()
|
||||||
if (!buildNum) {
|
if (!buildNum) {
|
||||||
buildNum = sh(returnStdout: true, script: 'git rev-list --count HEAD').trim()
|
buildNum = "0"
|
||||||
}
|
|
||||||
semver = "${base}-${buildNum}"
|
|
||||||
}
|
}
|
||||||
|
def semver = "${base}-${buildNum}"
|
||||||
sh "echo SEMVER=${semver} > build.env"
|
sh "echo SEMVER=${semver} > build.env"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user