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

Merge branch 'sh-fix-charts-build-error' into 'master'

Browse source 
Avoid error if /opt already exists

See merge request gitlab-org/gitlab-build-images!159
This commit is contained in:
Stan Hu 2019-02-06 01:59:19 +00:00
commit 575e37fa8c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.gitlab-charts-build-base
View file

@ -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} \

2
Dockerfile.gitlab-qa-alpine
View file

@ -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} && \