From 5de6ebd2e2dcc8b13d3445d55d14bdbd619cdf9a Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Sat, 27 Dec 2014 05:54:38 +0800
Subject: [PATCH] Use official tomcat repo rather
---
Dockerfile | 5 ++---
71-apt-cacher-ng | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/71-apt-cacher-ng b/71-apt-cacher-ng
index 30cbc19..ddae14e 100644
--- a/71-apt-cacher-ng
+++ b/71-apt-cacher-ng
@@ -1,2 +1,2 @@
#Acquire::http { Proxy "http://192.168.2.9:3142"; };
-#Acquire::http { Proxy "http://192.168.0.13:3142"; };
+#Acquire::http { Proxy "http://192.168.0.101:3142"; };
diff --git a/Dockerfile b/Dockerfile
index b6e2d70..af48e6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
-FROM consol/tomcat-8.0
+FROM tomcat:8.0
MAINTAINER Tim Sutton<tim@linfiniti.com>
RUN export DEBIAN_FRONTEND=noninteractive
@@ -12,8 +12,7 @@
# Or comment this line out if you do not with to use caching
ADD 71-apt-cacher-ng /etc/apt/apt.conf.d/71-apt-cacher-ng
-RUN echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" > /etc/apt/sources.list
-#RUN apt-get -y update
+RUN apt-get -y update
#-------------Application Specific Stuff ----------------------------------------------------
--
Gitblit v0.0.0-SNAPSHOT