diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c44a60..ae34a2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: stage: build rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - when: manual + when: manual .test_build: &test_build extends: .test diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 9b2ea61..e207c35 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -305,7 +305,7 @@ function build_custom_if_needed() { # This re-uses and builds an existing image if needed 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" eval $docker_command }