You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/14 17:07:42 UTC
[39/53] [abbrv] incubator-trafficcontrol git commit: Docker build:
portal requires gcc; make all Docker build files consistent
Docker build: portal requires gcc; make all Docker build files consistent
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/558ddb27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/558ddb27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/558ddb27
Branch: refs/heads/psql-rebase
Commit: 558ddb270ee21512cd470e4d20e88d1f40c0c1ce
Parents: 0e4d60c
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Oct 6 13:34:05 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 14:14:45 2016 -0700
----------------------------------------------------------------------
infrastructure/docker/build/Dockerfile-clone | 1 -
.../docker/build/Dockerfile-traffic_monitor | 29 --------------------
.../docker/build/Dockerfile-traffic_ops | 3 +-
.../docker/build/Dockerfile-traffic_portal | 25 -----------------
.../docker/build/Dockerfile-traffic_router | 29 --------------------
5 files changed, 2 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/558ddb27/infrastructure/docker/build/Dockerfile-clone
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-clone b/infrastructure/docker/build/Dockerfile-clone
index f03a010..64a8698 100644
--- a/infrastructure/docker/build/Dockerfile-clone
+++ b/infrastructure/docker/build/Dockerfile-clone
@@ -5,7 +5,6 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
- golang \
rpm-build && \
yum -y clean all
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/558ddb27/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index e3c2655..a97aaed 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-=======
->>>>>>> 343f0b7... move docker-compose files to infrastructure
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -24,7 +21,6 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
-<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -38,14 +34,6 @@ RUN yum -y install \
which && \
yum -y clean all
-=======
- rpm-build
-
-RUN yum -y install \
- which
-
-### java/mvn
->>>>>>> 343f0b7... move docker-compose files to infrastructure
WORKDIR /opt
RUN curl -L -b "oraclelicense=a" http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jdk-8u101-linux-x64.tar.gz | tar xzf - && \
curl -L http://mirror.nexcess.net/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz | tar xzf -
@@ -58,7 +46,6 @@ RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
alternatives --set jar /opt/java/bin/jar && \
alternatives --set javac /opt/java/bin/javac && \
alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
-<<<<<<< HEAD
WORKDIR /
###
@@ -67,21 +54,5 @@ VOLUME ./artifacts:/artifacts
ADD run-build.sh .
CMD ./run-build.sh traffic_monitor 2>&1 | tee /artifacts/build-traffic_monitor.log
-=======
-###
-
-# wait for clone to finish, then start build
-RUN echo $'\n\
-while [ ! -f /repo/clone-finished ]; do sleep 1; done\n\
-\n\
-tc=/repo/traffic_control\n\
-cd $tc/traffic_monitor\n\
-./build/build_rpm.sh\n\
-mkdir -p /artifacts\n\
-cp $tc/dist/* /artifacts/.\n\
-' >/run.sh
-
-CMD sh -x /run.sh
->>>>>>> 343f0b7... move docker-compose files to infrastructure
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/558ddb27/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index fd2c07b..0e379e7 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -5,7 +5,8 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
- rpm-build
+ rpm-build && \
+ yum -y clean all
RUN yum -y install \
golang
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/558ddb27/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 4de2b23..7d535f5 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-=======
->>>>>>> 343f0b7... move docker-compose files to infrastructure
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -24,7 +21,6 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
-<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -36,11 +32,6 @@ WORKDIR /repo
# traffic_portal specific
RUN yum -y install \
gcc \
-=======
- rpm-build
-
-RUN yum -y install \
->>>>>>> 343f0b7... move docker-compose files to infrastructure
libffi-devel \
make \
nodejs \
@@ -54,7 +45,6 @@ RUN npm -g install bower grunt-cli
# bower will not run as root by default
RUN echo '{ "allow_root": true }' > /root/.bowerrc
-<<<<<<< HEAD
###
VOLUME ./artifacts:/artifacts
@@ -62,20 +52,5 @@ VOLUME ./artifacts:/artifacts
ADD run-build.sh .
CMD ./run-build.sh traffic_portal 2>&1 | tee /artifacts/build-traffic_portal.log
-=======
-# wait for clone to be available, then
-# build the rpm and copy to /artifacts
-RUN echo $'\n\
-while [ ! -f /repo/clone-finished ]; do sleep 1; done\n\
-\n\
-tc=/repo/traffic_control\n\
-cd $tc/traffic_portal\n\
-./build/build_rpm.sh\n\
-mkdir -p /artifacts\n\
-cp $tc/dist/* /artifacts/.\n\
-' >/run.sh
-
-CMD sh -x /run.sh
->>>>>>> 343f0b7... move docker-compose files to infrastructure
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/558ddb27/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 723e01b..e2188f9 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-=======
->>>>>>> 343f0b7... move docker-compose files to infrastructure
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -24,7 +21,6 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
-<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -37,14 +33,6 @@ WORKDIR /repo
RUN yum -y install \
which
-=======
- rpm-build
-
-RUN yum -y install \
- which
-
-### java/mvn
->>>>>>> 343f0b7... move docker-compose files to infrastructure
WORKDIR /opt
RUN curl -L -b "oraclelicense=a" http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jdk-8u101-linux-x64.tar.gz | tar xzf - && \
curl -L http://mirror.nexcess.net/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz | tar xzf -
@@ -57,7 +45,6 @@ RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
alternatives --set jar /opt/java/bin/jar && \
alternatives --set javac /opt/java/bin/javac && \
alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
-<<<<<<< HEAD
###
VOLUME ./artifacts:/artifacts
@@ -65,21 +52,5 @@ VOLUME ./artifacts:/artifacts
ADD run-build.sh .
CMD ./run-build.sh traffic_router 2>&1 | tee /artifacts/build-traffic_router.log
-=======
-
-# wait for clone to be available, then
-# build the rpm and copy to /artifacts
-RUN echo $'\n\
-while [ ! -f /repo/clone-finished ]; do sleep 1; done\n\
-\n\
-tc=/repo/traffic_control\n\
-cd $tc/traffic_router\n\
-./build/build_rpm.sh\n\
-mkdir -p /artifacts\n\
-cp $tc/dist/* /artifacts/.\n\
-' >/run.sh
-
-CMD sh -x /run.sh
->>>>>>> 343f0b7... move docker-compose files to infrastructure
# vi:syntax=Dockerfile