Skip to content

Commit 76b21cf

Browse files
authored
Merge pull request #142 from DataDog/sarahchen6/tag-ci
Tag CI images with `ci-` prefix
2 parents ab68a82 + 6922324 commit 76b21cf

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Image variants are available on a per JDK basis:
1111
- The `zulu8`, `zulu11`, `oracle8`, `ibm8`, `semeru8`, `semeru11`, `semeru17`, `graalvm17`, `graalvm21`, and `graalvm25` variants all contain the base JDKs in addition to the specific JDK from their name,
1212
- The `latest` variant contains the base JDKs and all the above specific JDKs.
1313

14-
Images are tagged via the [Tag new images version](https://github.com/DataDog/dd-trace-java-docker-build/actions/workflows/docker-tag.yml) workflow. This workflow tags the latest images built from the specified branch using the `vYY.MM` format. It runs quarterly on `master` but can also be triggered manually as needed.
14+
Images are tagged via the [Tag new images version](https://github.com/DataDog/dd-trace-java-docker-build/actions/workflows/docker-tag.yml) workflow. This workflow tags the latest images built from the specified branch with a `ci-` prefix. It runs quarterly on `master` but can also be triggered manually as needed.
1515

1616
## Development
1717

build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,20 +233,19 @@ function do_push() {
233233
}
234234

235235
function do_tag() {
236-
local tag token version
236+
local tag
237237
TAG_PREFIX=
238238
echo "Pulling latest images"
239239
for tag in base latest "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
240240
tag="${tag,,}"
241241
tag="$(image_name "${tag}")"
242242
docker pull "$tag"
243243
done
244-
version="$(date +%y.%m)"
245-
echo "Tagging version $version"
244+
echo "Tagging ci- images"
246245
for tag in base latest "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
247246
tag="${tag,,}"
248247
tag="$(image_name "${tag}")"
249-
new_tag="${tag/:/:v$version-}"
248+
new_tag="${tag/:/:ci-}"
250249
docker tag "$tag" "$new_tag"
251250
docker push "$new_tag"
252251
done

0 commit comments

Comments
 (0)