diff options
| author | Ryan Schanzenbacher <ryan@rschanz.org> | 2026-06-10 18:10:24 -0400 |
|---|---|---|
| committer | Ryan Schanzenbacher <ryan@rschanz.org> | 2026-06-10 18:10:24 -0400 |
| commit | 31631ac9c242e13521420530b2fd6105ef728123 (patch) | |
| tree | 60ff168844b2fed88013061bf30cc3d385430003 | |
| parent | 6709dfe2047bf7fa6e298e96add28814cafd92b7 (diff) | |
test 3
| -rw-r--r-- | Jenkinsfile | 8 | ||||
| -rw-r--r-- | test-1/Dockerfile | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 3b197f4..10953db 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 \ | 55 | docker build --tls=false\ |
| 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 ${tag}:${shortSha} ${tag}:latest | 63 | docker tag --tls=false ${tag}:${shortSha} ${tag}:latest |
| 64 | docker push ${tag}:${shortSha} | 64 | docker push --tls=false ${tag}:${shortSha} |
| 65 | docker push ${tag}:latest | 65 | docker push --tls=false ${tag}:latest |
| 66 | """ | 66 | """ |
| 67 | } | 67 | } |
| 68 | } | 68 | } |
diff --git a/test-1/Dockerfile b/test-1/Dockerfile index f32e3e8..b4e1dd4 100644 --- a/test-1/Dockerfile +++ b/test-1/Dockerfile | |||
| @@ -2,6 +2,4 @@ FROM ubuntu:latest | |||
| 2 | 2 | ||
| 3 | RUN apt update && apt install -y git | 3 | RUN apt update && apt install -y git |
| 4 | 4 | ||
| 5 | RUN git --version | ||
| 6 | |||
| 7 | ENTRYPOINT ['git'] | 5 | ENTRYPOINT ['git'] |
