From 584e7c6cffc24c82631590a4158f6248b2b12b57 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 5 Feb 2019 17:35:02 -0800 Subject: [PATCH] Avoid error if /opt already exists This fixes the build error: https://gitlab.com/gitlab-org/gitlab-build-images/-/jobs/156906378 --- Dockerfile.gitlab-charts-build-base | 2 +- Dockerfile.gitlab-qa-alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.gitlab-charts-build-base b/Dockerfile.gitlab-charts-build-base index e42b485..178b16b 100644 --- a/Dockerfile.gitlab-charts-build-base +++ b/Dockerfile.gitlab-charts-build-base @@ -10,7 +10,7 @@ ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUB # Install dependencies RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2\ - && mkdir /opt + && mkdir -p /opt # Install kubectl RUN curl -L -o /usr/local/bin/kubectl ${KUBECTL_URL} \ diff --git a/Dockerfile.gitlab-qa-alpine b/Dockerfile.gitlab-qa-alpine index 2da8d3d..340de9b 100644 --- a/Dockerfile.gitlab-qa-alpine +++ b/Dockerfile.gitlab-qa-alpine @@ -15,7 +15,7 @@ ENV DOCKER_CHECKSUM="2d92728714d794f78619785a2c638b58b0b15e60b340de51886bf6d3730 ENV DOCKER_BIN="/usr/local/bin/docker" # Install dependencies -RUN apk --no-cache add -U openssl tar gzip bash ca-certificates && mkdir /opt +RUN apk --no-cache add -U openssl tar gzip bash ca-certificates && mkdir -p /opt RUN wget -q ${DOCKER_URL} && \ tar -zxf ${DOCKER_ARCHIVE} && \