diff options
| -rw-r--r-- | Jenkinsfile | 8 | ||||
| -rw-r--r-- | test-1/Dockerfile | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 10953db..5d04815 100644 --- a/Jenkinsfile +++ b/Jenkinsfile | |||
| @@ -52,7 +52,7 @@ pipeline { | |||
| 52 | env.IMAGES_TO_BUILD.split(',').each { img -> | 52 | env.IMAGES_TO_BUILD.split(',').each { img -> |
| 53 | def tag = "${REGISTRY}/${img}" | 53 | def tag = "${REGISTRY}/${img}" |
| 54 | sh """ | 54 | sh """ |
| 55 | docker build --tls=false\ | 55 | docker --tls=false build \ |
| 56 | --label org.opencontainers.image.source=${env.GIT_URL} \ | 56 | --label org.opencontainers.image.source=${env.GIT_URL} \ |
| 57 | --label org.opencontainers.image.revision=${env.GIT_COMMIT} \ | 57 | --label org.opencontainers.image.revision=${env.GIT_COMMIT} \ |
| 58 | -t ${tag}:${shortSha} \ | 58 | -t ${tag}:${shortSha} \ |
| @@ -60,9 +60,9 @@ pipeline { | |||
| 60 | """ | 60 | """ |
| 61 | if (env.BRANCH_NAME == 'main') { | 61 | if (env.BRANCH_NAME == 'main') { |
| 62 | sh """ | 62 | sh """ |
| 63 | docker tag --tls=false ${tag}:${shortSha} ${tag}:latest | 63 | docker --tls=false tag ${tag}:${shortSha} ${tag}:latest |
| 64 | docker push --tls=false ${tag}:${shortSha} | 64 | docker --tls=false push ${tag}:${shortSha} |
| 65 | docker push --tls=false ${tag}:latest | 65 | docker --tls=false push ${tag}:latest |
| 66 | """ | 66 | """ |
| 67 | } | 67 | } |
| 68 | } | 68 | } |
diff --git a/test-1/Dockerfile b/test-1/Dockerfile index b4e1dd4..51138f4 100644 --- a/test-1/Dockerfile +++ b/test-1/Dockerfile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | FROM ubuntu:latest | 1 | FROM ubuntu:latest |
| 2 | 2 | ||
| 3 | RUN apt update && apt install -y git | 3 | RUN apt update && apt install -y git curl |
| 4 | 4 | ||
| 5 | ENTRYPOINT ['git'] | 5 | ENTRYPOINT ['git'] |
