Commit 4bcea72f authored by Steve Azzopardi's avatar Steve Azzopardi

Merge branch 'refactor-Dockerfiles' into 'master'

Refactor dockerfiles

See merge request !1068
parents bb9cfc16 e228fbf9
Pipeline #45484353 passed with stages
in 26 minutes and 49 seconds
FROM golang:1.8.7
# Install required dependencies
RUN apt-get update -yq
RUN apt-get install -yq locales make xz-utils \
RUN apt-get update -yq && \
apt-get install -yq locales make xz-utils \
ruby ruby-dev python-pip \
dpkg-sig createrepo rpm \
zip libffi-dev jq
zip libffi-dev jq && \
rm -rf /var/lib/apt/lists/*
# Set default locale for the environment
RUN echo "en_US UTF-8" > /etc/locale.gen; \
......@@ -23,7 +24,7 @@ RUN wget -q https://get.docker.com/builds/Linux/x86_64/docker-1.13.1.tgz -O /tmp
rm -rf /tmp/*
COPY Makefile* /tmp/
RUN cd /tmp; \
make deps package-deps packagecloud-deps
WORKDIR /tmp
RUN make deps package-deps packagecloud-deps
RUN go get -u github.com/jstemmer/go-junit-report
\ No newline at end of file
......@@ -3,7 +3,6 @@ FROM ubuntu:16.04
RUN apt-get update -y && \
apt-get upgrade -y && \
apt-get install -y ca-certificates wget apt-transport-https vim nano tzdata && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
ARG DOCKER_MACHINE_VERSION
......@@ -14,7 +13,6 @@ COPY checksums /tmp/
RUN dpkg -i /tmp/gitlab-runner_amd64.deb; \
apt-get update && \
apt-get -f install -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
rm /tmp/gitlab-runner_amd64.deb && \
gitlab-runner --version && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment