You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/01/17 19:59:40 UTC

[1/2] incubator-trafficcontrol git commit: no need to compile git

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 068dac649 -> 24802411a


no need to compile git


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3aac5b08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3aac5b08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3aac5b08

Branch: refs/heads/master
Commit: 3aac5b086727f312fd12af4b8822f7b5263ec675
Parents: 068dac6
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Jan 17 09:54:50 2017 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Jan 17 12:59:04 2017 -0700

----------------------------------------------------------------------
 .../docker/build/Dockerfile-traffic_ops         | 26 ++++++--------------
 1 file changed, 8 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3aac5b08/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 24878c7..0aabc27 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -20,27 +20,17 @@ MAINTAINER Dan Kirkwood
 
 RUN	yum -y install \
 		epel-release \
+		expat-devel \
+		gcc \
 		git \
-		rpm-build && \
+		libcurl-devel \
+		make \
+		openssl-devel \
+		perl-ExtUtils-MakeMaker \
+		rpm-build \
+		tar && \
 	yum -y clean all
 
-# install latest git
-RUN yum install -y \
-	expat-devel \
-	gcc \
-	gettext \
-	libcurl-devel \
-	make \
-	openssl-devel \
-	perl-ExtUtils-MakeMaker \
-	tar \
-	tcl && \
-	git clone https://github.com/git/git.git && \
-	cd git && \
-	make prefix=/usr/local all && \
-	make prefix=/usr/local install
-
-
 # all ENV vars can be controlled by, e.g. `docker run -e BRANCH=1.6.x <image>`
 ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
 ENV BRANCH=master


[2/2] incubator-trafficcontrol git commit: This closes #192

Posted by mi...@apache.org.
This closes #192


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/24802411
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/24802411
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/24802411

Branch: refs/heads/master
Commit: 24802411a780f2dca07dd2b93f9d3a693062f174
Parents: 3aac5b0
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Jan 17 12:59:33 2017 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Jan 17 12:59:33 2017 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------