You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2020/04/30 02:32:50 UTC

[trafficcontrol] branch master updated: Use prebuilt images to build Traffic Control components (#4639)

This is an automated email from the ASF dual-hosted git repository.

ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 65c7f10  Use prebuilt images to build Traffic Control components (#4639)
65c7f10 is described below

commit 65c7f1063cb13a8c911d1667aa1df9bfebbd8148
Author: Zach Hoffman <za...@zrhoffman.net>
AuthorDate: Wed Apr 29 20:32:37 2020 -0600

    Use prebuilt images to build Traffic Control components (#4639)
    
    * Use prebuilt images to build Traffic Control components
    
    * Use the master tag for build images
---
 CHANGELOG.md                                   |  1 +
 infrastructure/docker/build/docker-compose.yml | 72 +++++++++++++-------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 269e09c..369fbeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Added ability to create multiple objects from generic API Create with a single POST.
 - Added debugging functionality to CDN-in-a-Box.
 - Added an SMTP server to CDN-in-a-Box.
+- Cached builder Docker images on Docker Hub to speed up build time
 - Traffic Ops Golang Endpoints
   - /api/2.0 for all of the most recent route versions
   - /api/1.1/cachegroupparameters/{{cachegroupID}}/{{parameterID}} `(DELETE)`
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index 49a3893..75a206a 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -19,67 +19,67 @@ version: '2'
 
 services:
   source:
-    image: trafficcontrol_tarball
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-source
-      context: ../../..
+    image: trafficcontrol/source_tarballer:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-source
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_monitor_build:
-    image: traffic_monitor_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor
-      context: ../../..
+    image: trafficcontrol/traffic_monitor_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_ops_build:
-    image: traffic_ops_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops
-      context: ../../..
+    image: trafficcontrol/traffic_ops_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_portal_build:
-    image: traffic_portal_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-traffic_portal
-      context: ../../..
+    image: trafficcontrol/traffic_portal_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_portal
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_router_build:
-    image: traffic_router_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-traffic_router
-      context: ../../..
+    image: trafficcontrol/traffic_router_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_router
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
       - ../../../.m2:/root/.m2:z
 
   traffic_stats_build:
-    image: traffic_stats_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-traffic_stats
-      context: ../../..
+    image: trafficcontrol/traffic_stats_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_stats
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   grove_build:
-    image: grove_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-grove
-      context: ../../..
+    image: trafficcontrol/grove_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-grove
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   grovetccfg_build:
-    image: grovetccfg_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-grovetccfg
-      context: ../../..
+    image: trafficcontrol/grovetccfg_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-grovetccfg
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
@@ -90,9 +90,9 @@ services:
     command: ['-f', '/trafficcontrol/dist/weasel.txt', '/trafficcontrol']
 
   docs:
-    image: docs_builder
-    build:
-      dockerfile: infrastructure/docker/build/Dockerfile-docs
-      context: ../../..
+    image: trafficcontrol/docs_builder:master
+    #build:
+    #  dockerfile: infrastructure/docker/build/Dockerfile-docs
+    #  context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z