diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c503c7d..94fc729 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,5 +168,5 @@ upload: echo; echo "File to upload $upload_filename"; upload_to_s3 "$package" "$upload_filename"; - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=$upload_filename&target_url=${S3_URL}" + curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=$upload_filename&target_url=${S3_URL}"; done diff --git a/builder/build-tarball b/builder/build-tarball index 9169681..3a85a8e 100755 --- a/builder/build-tarball +++ b/builder/build-tarball @@ -19,11 +19,7 @@ move_libjpeg_turbo_to_os_specific_dir() { $PWD/builder/build/${os_codename}/ } -echo "GITLAB_SHARED_DIND_DIR= ${GITLAB_SHARED_DIND_DIR}" -shared_with_docker_dir="/tmp" -# fall back to /tmp if not writable -#if [ ! -w "$GITLAB_SHARED_DIND_DIR" ]; then shared_with_docker_dir="/tmp"; fi -echo "SHARED_WITH_DOCKER_DIR= ${shared_with_docker_dir}" +shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp} cd "$(dirname "$0")/.." . builder/os_ver_cli.sh