NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix custom-docker-build

Browse source
This commit is contained in:
Kamil Trzciński 2021-02-02 13:33:49 +01:00
parent 74dda8518c
commit c393e4e804
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -29,7 +29,7 @@ variables:
stage: build stage: build
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: manual when: manual
.test_build: &test_build .test_build: &test_build
extends: .test extends: .test

2
scripts/custom-docker-build
View file

@ -305,7 +305,7 @@ function build_custom_if_needed() {
# This re-uses and builds an existing image if needed # This re-uses and builds an existing image if needed
docker pull "$full_image" || true docker pull "$full_image" || true
docker_command=$(generate_command --from-cache="$full_image_name" $@) docker_command=$(generate_command $@ --from-cache="$full_image_name" )
echo "Building $build_image_name with $docker_command" echo "Building $build_image_name with $docker_command"
eval $docker_command eval $docker_command
} }