From 56133003236a5d617f0457c6d64979418c4ae1d6 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Sep 2016 13:24:57 +0100 Subject: [PATCH 1/3] add sources.list, restructure dockerfile to avoid breaking apt with version from multiverse --- Dockerfile | 16 +++++++++++++++- sources.list | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 sources.list diff --git a/Dockerfile b/Dockerfile index f1ff40e..4118fef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,11 +21,25 @@ RUN \ /config \ /defaults -# install packages +# install apt-utils RUN \ apt-get update && \ apt-get install -y \ apt-utils && \ + +# cleanup + apt-get clean && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* + +# copy sources +COPY sources.list /etc/apt/ + +# install packages +RUN \ + apt-get update && \ apt-get install -y \ curl && \ diff --git a/sources.list b/sources.list new file mode 100644 index 0000000..754690e --- /dev/null +++ b/sources.list @@ -0,0 +1,13 @@ +#################################################################################### +####### These repos should only be used for building docker containers ####### +####### on premise by lsio and on lsio's servers, the may not preform well ####### +####### from your home. ####### +#################################################################################### + +deb http://mirrors.digitalocean.com/ubuntu/ trusty main restricted universe multiverse +deb-src http://mirrors.digitalocean.com/ubuntu/ trusty main restricted universe multiverse +deb http://mirrors.digitalocean.com/ubuntu/ trusty-updates main restricted universe multiverse +deb-src http://mirrors.digitalocean.com/ubuntu/ trusty-updates main restricted universe multiverse + +deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse +deb-src http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse From d95115b3659ca566378249dc43f91927938202d9 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Sep 2016 13:52:26 +0100 Subject: [PATCH 2/3] ditch mirrors sources.list, in favour of just adding multiverse to the default list, too many downstream problems with mirror version --- Dockerfile | 15 +++------------ sources.list | 42 +++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4118fef..d275774 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,25 +21,16 @@ RUN \ /config \ /defaults +# copy sources +COPY sources.list /etc/apt/ + # install apt-utils RUN \ apt-get update && \ apt-get install -y \ apt-utils && \ -# cleanup - apt-get clean && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* - -# copy sources -COPY sources.list /etc/apt/ - # install packages -RUN \ - apt-get update && \ apt-get install -y \ curl && \ diff --git a/sources.list b/sources.list index 754690e..0eaeeec 100644 --- a/sources.list +++ b/sources.list @@ -1,13 +1,33 @@ -#################################################################################### -####### These repos should only be used for building docker containers ####### -####### on premise by lsio and on lsio's servers, the may not preform well ####### -####### from your home. ####### -#################################################################################### +# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to +# newer versions of the distribution. -deb http://mirrors.digitalocean.com/ubuntu/ trusty main restricted universe multiverse -deb-src http://mirrors.digitalocean.com/ubuntu/ trusty main restricted universe multiverse -deb http://mirrors.digitalocean.com/ubuntu/ trusty-updates main restricted universe multiverse -deb-src http://mirrors.digitalocean.com/ubuntu/ trusty-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted -deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -deb-src http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse +## Major bug fix updates produced after the final release of the +## distribution. +deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted + +## Uncomment the following two lines to add software from the 'universe' +## repository. +## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team. Also, please note that software in universe WILL NOT receive any +## review or updates from the Ubuntu security team. +deb http://archive.ubuntu.com/ubuntu/ xenial universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ xenial universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial-updates universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates universe multiverse + +## N.B. software from this repository may not have been tested as +## extensively as that contained in the main release, although it includes +## newer versions of some applications which may provide useful features. +## Also, please note that software in backports WILL NOT receive any review +## or updates from the Ubuntu security team. +# deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted +# deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted +deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted +deb http://archive.ubuntu.com/ubuntu/ xenial-security universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ xenial-security universe multiverse From 02d84c124e29ea861b0e20039a3d37bd2397bbc2 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 4 Sep 2016 14:00:53 +0100 Subject: [PATCH 3/3] bump overlay version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d275774..544f072 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV HOME="/root" ENV TERM="xterm" # set version for s6 overlay -ARG OVERLAY_VERSION="v1.18.1.3" +ARG OVERLAY_VERSION="v1.18.1.5" ARG OVERLAY_ARCH="amd64" ARG OVERLAY_URL="https://github.com/just-containers/s6-overlay/releases/download" ARG OVERLAY_WWW="${OVERLAY_URL}"/"${OVERLAY_VERSION}"/s6-overlay-"${OVERLAY_ARCH}".tar.gz