Skip to content
Snippets Groups Projects
Commit 96d88322 authored by Steve Azzopardi's avatar Steve Azzopardi
Browse files

Merge branch 'dont-use-cache-when-building-official-docker-images' into 'master'

Don't use cache when building official Docker images

See merge request gitlab-org/gitlab-runner!1067
parents 84aa9704 9281beff
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ _docker() { ...@@ -25,7 +25,7 @@ _docker() {
build() { build() {
echo -e "\033[1mBuilding image: \033[32m${1}\033[0m" echo -e "\033[1mBuilding image: \033[32m${1}\033[0m"
_docker build \ _docker build \
--cache-from "${3}" \ --no-cache \
--build-arg DOCKER_MACHINE_VERSION="${DOCKER_MACHINE_VERSION}" \ --build-arg DOCKER_MACHINE_VERSION="${DOCKER_MACHINE_VERSION}" \
--build-arg DUMB_INIT_VERSION="${DUMB_INIT_VERSION}" \ --build-arg DUMB_INIT_VERSION="${DUMB_INIT_VERSION}" \
-t "${1}" \ -t "${1}" \
...@@ -50,11 +50,6 @@ tag_latest() { ...@@ -50,11 +50,6 @@ tag_latest() {
tag "${@}" tag "${@}"
} }
pull() {
echo -e "\033[1mPulling image: \033[32m${1}\033[0m"
_docker pull "${1}"
}
push() { push() {
echo -e "\033[1mPushing image: \033[32m${1}\033[0m" echo -e "\033[1mPushing image: \033[32m${1}\033[0m"
_docker push "${1}" _docker push "${1}"
...@@ -105,11 +100,8 @@ cp dockerfiles/checksums dockerfiles/ubuntu ...@@ -105,11 +100,8 @@ cp dockerfiles/checksums dockerfiles/ubuntu
cp out/binaries/gitlab-runner-linux-amd64 dockerfiles/alpine cp out/binaries/gitlab-runner-linux-amd64 dockerfiles/alpine
cp dockerfiles/checksums dockerfiles/alpine cp dockerfiles/checksums dockerfiles/alpine
pull gitlab/gitlab-runner:ubuntu build "gitlab/gitlab-runner:ubuntu-${ref_tag}" dockerfiles/ubuntu
pull gitlab/gitlab-runner:alpine build "gitlab/gitlab-runner:alpine-${ref_tag}" dockerfiles/alpine
build "gitlab/gitlab-runner:ubuntu-${ref_tag}" dockerfiles/ubuntu gitlab/gitlab-runner:ubuntu
build "gitlab/gitlab-runner:alpine-${ref_tag}" dockerfiles/alpine gitlab/gitlab-runner:alpine
tag "gitlab/gitlab-runner:ubuntu-${ref_tag}" "gitlab/gitlab-runner:${ref_tag}" tag "gitlab/gitlab-runner:ubuntu-${ref_tag}" "gitlab/gitlab-runner:${ref_tag}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment