Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Ubuntu 16.04 LTS #1

Merged
merged 2 commits into from
Nov 24, 2016
Merged

Upgrade to Ubuntu 16.04 LTS #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2edcf
update to xenial
saschanaz Nov 21, 2016
0de46ba
git-core -> git
saschanaz Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM sameersbn/ubuntu:14.04.20161014
FROM ubuntu:xenial
MAINTAINER [email protected]

RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \
&& echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
vim.tiny wget sudo net-tools ca-certificates unzip git openssh-client curl libapparmor1

ENV GITLAB_CI_MULTI_RUNNER_VERSION=1.7.0 \
GITLAB_CI_MULTI_RUNNER_USER=gitlab_ci_multi_runner \
GITLAB_CI_MULTI_RUNNER_HOME_DIR="/home/gitlab_ci_multi_runner"
ENV GITLAB_CI_MULTI_RUNNER_DATA_DIR="${GITLAB_CI_MULTI_RUNNER_HOME_DIR}/data"

RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu trusty main" >> /etc/apt/sources.list \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
git-core openssh-client curl libapparmor1 \
&& wget -O /usr/local/bin/gitlab-ci-multi-runner \
RUN wget -O /usr/local/bin/gitlab-ci-multi-runner \
https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${GITLAB_CI_MULTI_RUNNER_VERSION}/binaries/gitlab-ci-multi-runner-linux-amd64 \
&& chmod 0755 /usr/local/bin/gitlab-ci-multi-runner \
&& adduser --disabled-login --gecos 'GitLab CI Runner' ${GITLAB_CI_MULTI_RUNNER_USER} \
Expand All @@ -21,6 +22,8 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60
COPY entrypoint.sh /sbin/entrypoint.sh
RUN chmod 755 /sbin/entrypoint.sh

RUN rm -rf /var/lib/apt/lists/*

VOLUME ["${GITLAB_CI_MULTI_RUNNER_DATA_DIR}"]
WORKDIR "${GITLAB_CI_MULTI_RUNNER_HOME_DIR}"
ENTRYPOINT ["/sbin/entrypoint.sh"]