Install wget in Dockerfile.x86_64
What does this MR do?
Install wget in Dockerfile.x86_64
The default busybox wget does not work behind a proxy. Before this patch:
$ docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t gitlab/gitlab-runner-helper:x86_64-f6f376b7 -f dockerfiles/build/Dockerfile.x86_64 dockerfiles/build
Sending build context to Docker daemon 6.144kB
Step 1/4 : FROM alpine:3.4
---> c7fc7faf8c28
Step 2/4 : RUN apk add --no-cache bash ca-certificates git miniperl && ln -s miniperl /usr/bin/perl
---> Using cache
---> 71068888a093
Step 3/4 : RUN cd /tmp && apk add --no-cache -U openssl && wget https://github.com/git-lfs/git-lfs/releases/download/v2.3.1/git-lfs-linux-amd64-2.3.1.tar.gz && tar zxf git-lfs-linux-amd64-2.3.1.tar.gz && mv git-lfs-*/git-lfs /usr/bin/ && git lfs install && apk del --purge openssl && rm -rf /tmp/*
---> Running in 8c9ff4058d7d
fetch http://dl-cdn.alpinelinux.org/alpine/v3.4/main/x86_64/APKINDEX.tar.gz
fetch http://dl-cdn.alpinelinux.org/alpine/v3.4/main/x86_64/APKINDEX.tar.gz
fetch http://dl-cdn.alpinelinux.org/alpine/v3.4/community/x86_64/APKINDEX.tar.gzfetch http://dl-cdn.alpinelinux.org/alpine/v3.4/community/x86_64/APKINDEX.tar.gz
(1/1) Installing openssl (1.0.2n-r0)
Executing busybox-1.24.2-r14.trigger
Executing ca-certificates-20161130-r0.trigger
OK: 32 MiB in 24 packages
Connecting to <PROXY_URL> (<PROXY_IP>)
wget: error getting response: Connection reset by peer
The command '/bin/sh -c cd /tmp && apk add --no-cache -U openssl && wget https://github.com/git-lfs/git-lfs/releases/download/v2.3.1/git-lfs-linux-amd64-2.3.1.tar.gz && tar zxf git-lfs-linux-amd64-2.3.1.tar.gz && mv git-lfs-*/git-lfs /usr/bin/ && git lfs install && apk del --purge openssl && rm -rf /tmp/*' returned a non-zero code: 1
This commit fixes this error by installing the usual wget
which can handle
proxies correctly.
Why was this MR needed?
The current image fails behind a proxy. See the error above.
Are there points in the code the reviewer needs to double check?
Does this MR meet the acceptance criteria?
-
Documentation created/updated - Tests
-
Added for this feature/bug -
All builds are passing
-
-
Branch has no merge conflicts with master
(if you do - rebase it please)