Skip to content

Commit 26e1c6a

Browse files
Revert "chore: prevent actual gitlab pushes"
This reverts commit 5a813e3.
1 parent 5a813e3 commit 26e1c6a

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

.gitlab/scripts/build_image.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,5 @@ docker buildx build \
4242
--platform $PLATFORM \
4343
-f .gitlab/scripts/${TARGET_IMAGE} \
4444
--tag "$DOCKER_TARGET_IMAGE:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${SUFFIX}" \
45-
.
46-
# --push .
47-
# printf "Image built and pushed to $DOCKER_TARGET_IMAGE:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${SUFFIX} for $PLATFORM\n"
45+
--push .
46+
printf "Image built and pushed to $DOCKER_TARGET_IMAGE:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${SUFFIX} for $PLATFORM\n"

.gitlab/scripts/build_private_image.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ docker buildx build \
4747
-f .gitlab/scripts/${TARGET_IMAGE} \
4848
--tag "$DOCKER_TARGET_IMAGE:${IMAGE_TAG}${SUFFIX}" \
4949
--tag "$DOCKER_TARGET_IMAGE:${VERSION}${SUFFIX}" \
50-
.
51-
# --push .
50+
--push .
5251

53-
# printf "Image built and pushed to $DOCKER_TARGET_IMAGE:${IMAGE_TAG}${SUFFIX} for arm64 and amd64\n"
52+
printf "Image built and pushed to $DOCKER_TARGET_IMAGE:${IMAGE_TAG}${SUFFIX} for arm64 and amd64\n"

.gitlab/templates/pipeline.yaml.tpl

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ publish layer {{ $environment.name }} ({{ $flavor.name }}):
160160
when: manual
161161
allow_failure: true
162162
- if: '$CI_COMMIT_TAG =~ /^v.*/'
163-
when: manual
164163

165164
needs:
166165
{{ if eq $environment.name "prod" }}
@@ -278,21 +277,21 @@ build images ({{ $multi_arch_image_flavor.name }}):
278277
script:
279278
- .gitlab/scripts/build_image.sh
280279

281-
# publish images ({{ $multi_arch_image_flavor.name }}):
282-
# stage: publish
283-
# rules:
284-
# - if: '$CI_COMMIT_TAG =~ /^v.*/'
285-
# needs:
286-
# - build images ({{ $multi_arch_image_flavor.name }})
287-
# when: manual
288-
# trigger:
289-
# project: DataDog/public-images
290-
# branch: main
291-
# strategy: depend
292-
# variables:
293-
# IMG_SOURCES: ${CI_DOCKER_TARGET_IMAGE}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}{{ $multi_arch_image_flavor.suffix }}
294-
# IMG_DESTINATIONS: lambda-extension:${VERSION}{{ $multi_arch_image_flavor.suffix }},lambda-extension:latest{{ $multi_arch_image_flavor.suffix }}
295-
# IMG_REGISTRIES: dockerhub,ecr-public,gcr-datadoghq
296-
# IMG_SIGNING: false
280+
publish images ({{ $multi_arch_image_flavor.name }}):
281+
stage: publish
282+
rules:
283+
- if: '$CI_COMMIT_TAG =~ /^v.*/'
284+
needs:
285+
- build images ({{ $multi_arch_image_flavor.name }})
286+
when: manual
287+
trigger:
288+
project: DataDog/public-images
289+
branch: main
290+
strategy: depend
291+
variables:
292+
IMG_SOURCES: ${CI_DOCKER_TARGET_IMAGE}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}{{ $multi_arch_image_flavor.suffix }}
293+
IMG_DESTINATIONS: lambda-extension:${VERSION}{{ $multi_arch_image_flavor.suffix }},lambda-extension:latest{{ $multi_arch_image_flavor.suffix }}
294+
IMG_REGISTRIES: dockerhub,ecr-public,gcr-datadoghq
295+
IMG_SIGNING: false
297296

298297
{{ end }} # end multi_arch_image_flavors

0 commit comments

Comments
 (0)