Skip to content

Commit adf4d1c

Browse files
committed
fix(ci): Fix image tag
1 parent 148aef9 commit adf4d1c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.github/workflows/update-docker-build-image.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ on:
44
schedule:
55
# A day after creating the tag from https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml
66
- cron: '0 0 1 2,5,8,11 *'
7+
push:
8+
branches:
9+
- bbujon/gh-workflows
710
workflow_dispatch:
811
inputs:
912
tag:
1013
description: 'The tag to use for the Docker build image'
1114
required: true
12-
default: 'vYY.MM-base'
15+
default: 'vYY.MM'
1316

1417
jobs:
1518
update-docker-build-image:
@@ -46,7 +49,7 @@ jobs:
4649
08|09|10) TAG_DATE="${CURRENT_YEAR}.07" ;;
4750
11|12) TAG_DATE="${CURRENT_YEAR}.10" ;;
4851
esac
49-
TAG="v${TAG_DATE}-base"
52+
TAG="v${TAG_DATE}"
5053
fi
5154
echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
5255
echo "::notice::Using Docker build image tag: ${TAG}"
@@ -55,7 +58,7 @@ jobs:
5558
sed -i 's|DOCKER_IMAGE_VERSION=.*|DOCKER_IMAGE_VERSION="${{ steps.define-tag.outputs.tag }}"|' .circleci/render_config.py
5659
- name: Update the Docker build image in GitLab CI config
5760
run: |
58-
sed -i 's|image: ghcr.io/datadog/dd-trace-java-docker-build:.*|image: ghcr.io/datadog/dd-trace-java-docker-build:${{ steps.define-tag.outputs.tag }}|' .gitlab-ci.yml
61+
sed -i 's|image: ghcr.io/datadog/dd-trace-java-docker-build:.*|image: ghcr.io/datadog/dd-trace-java-docker-build:${{ steps.define-tag.outputs.tag }}-base|' .gitlab-ci.yml
5962
- name: Commit and push changes
6063
env:
6164
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

0 commit comments

Comments
 (0)