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:37 UTC
[34/53] [abbrv] incubator-trafficcontrol git commit: move
docker-compose files to infrastructure
move docker-compose files to infrastructure
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fe2512b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fe2512b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fe2512b7
Branch: refs/heads/psql-rebase
Commit: fe2512b766a202a10e89d28b4d56c36f3488b41f
Parents: 29ba3b8
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Sep 30 14:04:12 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 14:08:22 2016 -0700
----------------------------------------------------------------------
build/Dockerfile-clone | 19 ------
build/Dockerfile-traffic_ops | 24 --------
build/docker-compose.yml | 30 ----------
infrastructure/docker/build/Dockerfile-clone | 22 +++++++
.../docker/build/Dockerfile-traffic_monitor | 29 +++++++++
.../docker/build/Dockerfile-traffic_ops | 62 +++++---------------
.../docker/build/Dockerfile-traffic_portal | 25 ++++++++
.../docker/build/Dockerfile-traffic_router | 29 +++++++++
.../docker/build/Dockerfile-traffic_stats | 24 ++++++++
infrastructure/docker/build/docker-compose.yml | 60 +++++++++++++++++++
10 files changed, 203 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/build/Dockerfile-clone
----------------------------------------------------------------------
diff --git a/build/Dockerfile-clone b/build/Dockerfile-clone
deleted file mode 100644
index 6f5e040..0000000
--- a/build/Dockerfile-clone
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM centos:7
-
-MAINTAINER Dan Kirkwood
-
-RUN yum -y install \
- epel-release \
- git \
- golang \
- rpm-build && \
- yum -y clean all
-
-ENV GITREPO=https://github.com/Comcast/traffic_control
-ENV BRANCH=master
-
-WORKDIR /repo
-RUN echo $'pwd; git clone $GITREPO -b $BRANCH traffic_control\n\
-' >/run.sh
-
-CMD sh -x /run.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/build/Dockerfile-traffic_ops b/build/Dockerfile-traffic_ops
deleted file mode 100644
index 0f0cddc..0000000
--- a/build/Dockerfile-traffic_ops
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM centos:7
-
-MAINTAINER Dan Kirkwood
-
-RUN yum -y install \
- epel-release \
- git \
- golang \
- rpm-build && \
- yum -y clean all
-
-# wait for clone to be available, then
-# build the rpm and copy to /artifacts
-
-RUN echo $'\n\
-tc=/repo/traffic_control\n\
-while [ ! -d $tc/traffic_ops ]; do sleep 1; done\n\
-cd $tc/traffic_ops\n\
-./build/build_rpm.sh\n\
-mkdir -p /artifacts\n\
-cp $tc/dist/* /artifacts/.\n\
-' >/run.sh
-
-CMD sh -x /run.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
deleted file mode 100644
index 6697a81..0000000
--- a/build/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-
-# Build configuration for traffic_control
-version: '2'
-
-volumes:
- repo:
-
-services:
- clone:
- build:
- dockerfile: Dockerfile-clone
- context: .
- environment:
- - GITREPO
- - BRANCH
- volumes:
- - repo:/repo
-
- traffic_ops_build:
- depends_on: [ clone ]
- build:
- dockerfile: Dockerfile-traffic_ops
- context: .
- environment:
- - GITREPO
- - BRANCH
- volumes:
- - repo:/repo
- - ./artifacts:/artifacts
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/infrastructure/docker/build/Dockerfile-clone
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-clone b/infrastructure/docker/build/Dockerfile-clone
new file mode 100644
index 0000000..f03a010
--- /dev/null
+++ b/infrastructure/docker/build/Dockerfile-clone
@@ -0,0 +1,22 @@
+FROM centos:7
+
+MAINTAINER Dan Kirkwood
+
+RUN yum -y install \
+ epel-release \
+ git \
+ golang \
+ rpm-build && \
+ yum -y clean all
+
+ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV BRANCH=master
+
+WORKDIR /repo
+RUN echo $'pwd; git clone $GITREPO -b $BRANCH traffic_control\n\
+touch clone-finished\n\
+' >/run.sh
+
+CMD sh -x /run.sh
+
+# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index a97aaed..e3c2655 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,8 @@
# 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
@@ -21,6 +24,7 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
+<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -34,6 +38,14 @@ 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 -
@@ -46,6 +58,7 @@ 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 /
###
@@ -54,5 +67,21 @@ 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/fe2512b7/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 24878c7..fd2c07b 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -1,19 +1,3 @@
-# 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
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -21,41 +5,23 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
- rpm-build && \
- yum -y clean all
+ rpm-build
-# 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
-
-WORKDIR /repo
-
-# traffic_ops specific
RUN yum -y install \
golang
-###
-
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-CMD ./run-build.sh traffic_ops 2>&1 | tee /artifacts/build-traffic_ops.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_ops\n\
+./build/build_rpm.sh\n\
+mkdir -p /artifacts\n\
+cp $tc/dist/* /artifacts/.\n\
+' >/run.sh
+
+CMD sh -x /run.sh
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 7d535f5..4de2b23 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,8 @@
# 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
@@ -21,6 +24,7 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
+<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -32,6 +36,11 @@ 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 \
@@ -45,6 +54,7 @@ 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
@@ -52,5 +62,20 @@ 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/fe2512b7/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index e2188f9..723e01b 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,8 @@
# 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
@@ -21,6 +24,7 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
+<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -33,6 +37,14 @@ 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 -
@@ -45,6 +57,7 @@ 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
@@ -52,5 +65,21 @@ 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
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe2512b7/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index d669b03..98e1db9 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,8 @@
# 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
@@ -21,6 +24,7 @@ MAINTAINER Dan Kirkwood
RUN yum -y install \
epel-release \
git \
+<<<<<<< HEAD
rpm-build && \
yum -y clean all
@@ -40,5 +44,25 @@ VOLUME ./artifacts:/artifacts
ADD run-build.sh .
CMD ./run-build.sh traffic_stats 2>&1 | tee /artifacts/build-traffic_stats.log
+=======
+ rpm-build
+
+RUN yum -y install \
+ golang
+
+# 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_stats\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/fe2512b7/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index 879446d..ef93f6c 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -35,6 +36,29 @@ version: '2'
services:
traffic_monitor_build:
image: traffic_monitor_builder
+=======
+---
+
+# Build configuration for traffic_control
+version: '2'
+
+volumes:
+ repo:
+
+services:
+ clone:
+ build:
+ dockerfile: Dockerfile-clone
+ context: .
+ environment:
+ - GITREPO
+ - BRANCH
+ volumes:
+ - repo:/repo
+
+ traffic_monitor_build:
+ depends_on: [ clone ]
+>>>>>>> 343f0b7... move docker-compose files to infrastructure
build:
dockerfile: Dockerfile-traffic_monitor
context: .
@@ -42,10 +66,18 @@ services:
- GITREPO
- BRANCH
volumes:
+<<<<<<< HEAD
- ./artifacts:/artifacts
traffic_ops_build:
image: traffic_ops_builder
+=======
+ - repo:/repo
+ - ./artifacts:/artifacts
+
+ traffic_ops_build:
+ depends_on: [ clone ]
+>>>>>>> 343f0b7... move docker-compose files to infrastructure
build:
dockerfile: Dockerfile-traffic_ops
context: .
@@ -53,10 +85,18 @@ services:
- GITREPO
- BRANCH
volumes:
+<<<<<<< HEAD
- ./artifacts:/artifacts
traffic_portal_build:
image: traffic_portal_builder
+=======
+ - repo:/repo
+ - ./artifacts:/artifacts
+
+ traffic_portal_build:
+ depends_on: [ clone ]
+>>>>>>> 343f0b7... move docker-compose files to infrastructure
build:
dockerfile: Dockerfile-traffic_portal
context: .
@@ -64,10 +104,18 @@ services:
- GITREPO
- BRANCH
volumes:
+<<<<<<< HEAD
- ./artifacts:/artifacts
traffic_router_build:
image: traffic_router_builder
+=======
+ - repo:/repo
+ - ./artifacts:/artifacts
+
+ traffic_router_build:
+ depends_on: [ clone ]
+>>>>>>> 343f0b7... move docker-compose files to infrastructure
build:
dockerfile: Dockerfile-traffic_router
context: .
@@ -75,10 +123,18 @@ services:
- GITREPO
- BRANCH
volumes:
+<<<<<<< HEAD
- ./artifacts:/artifacts
traffic_stats_build:
image: traffic_stats_builder
+=======
+ - repo:/repo
+ - ./artifacts:/artifacts
+
+ traffic_stats_build:
+ depends_on: [ clone ]
+>>>>>>> 343f0b7... move docker-compose files to infrastructure
build:
dockerfile: Dockerfile-traffic_stats
context: .
@@ -86,4 +142,8 @@ services:
- GITREPO
- BRANCH
volumes:
+<<<<<<< HEAD
+=======
+ - repo:/repo
+>>>>>>> 343f0b7... move docker-compose files to infrastructure
- ./artifacts:/artifacts