Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Do not require .git to build#5181

Merged
ocket8888 merged 2 commits intoapache:masterfrom
zrhoffman:do-not-require-.git
Oct 21, 2020
Merged

Do not require .git to build#5181
ocket8888 merged 2 commits intoapache:masterfrom
zrhoffman:do-not-require-.git

Conversation

@zrhoffman
Copy link
Copy Markdown
Member

What does this PR (Pull Request) do?

Which Traffic Control components are affected by this PR?

  • Build system

What is the best way to verify this PR?

Apply this patch, then build

diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index 35e8967392..8e9395859a 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -19,75 +19,75 @@ version: '2'
 
 services:
   source:
-    image: apache/traffic_source_tarballer:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-source
-    #  context: ../../..
+    #image: apache/traffic_source_tarballer:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-source
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_monitor_build:
-    image: apache/traffic_monitor_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor
-    #  context: ../../..
+    #image: apache/traffic_monitor_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_ops_build:
-    image: apache/traffic_ops_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops
-    #  context: ../../..
+    #image: apache/traffic_ops_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_ops_ort_build:
-    image: apache/traffic_ops_ort_builder:5.0.x
-    # build:
-    #   dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops_ort
-    #   context: ../../..
-    volumes:
+    #image: apache/traffic_ops_ort_builder:5.0.x
+     build:
+       dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops_ort
+       context: ../../..
+     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_portal_build:
-    image: apache/traffic_portal_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_portal
-    #  context: ../../..
+    #image: apache/traffic_portal_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-traffic_portal
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   traffic_router_build:
-    image: apache/traffic_router_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_router
-    #  context: ../../..
+    #image: apache/traffic_router_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-traffic_router
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
       - ../../../.m2:/root/.m2:z
 
   traffic_stats_build:
-    image: apache/traffic_stats_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-traffic_stats
-    #  context: ../../..
+    #image: apache/traffic_stats_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-traffic_stats
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   grove_build:
-    image: apache/traffic_grove_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-grove
-    #  context: ../../..
+    #image: apache/traffic_grove_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-grove
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
   grovetccfg_build:
-    image: apache/traffic_grovetccfg_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-grovetccfg
-    #  context: ../../..
+    #image: apache/traffic_grovetccfg_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-grovetccfg
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z
 
@@ -98,9 +98,9 @@ services:
     command: ['-f', '/trafficcontrol/dist/weasel.txt', '/trafficcontrol']
 
   docs:
-    image: apache/traffic_docs_builder:5.0.x
-    #build:
-    #  dockerfile: infrastructure/docker/build/Dockerfile-docs
-    #  context: ../../..
+    #image: apache/traffic_docs_builder:5.0.x
+    build:
+      dockerfile: infrastructure/docker/build/Dockerfile-docs
+      context: ../../..
     volumes:
       - ../../..:/trafficcontrol:z

If this is a bug fix, what versions of Traffic Control are affected?

The following criteria are ALL met by this PR

  • Building the RPMs is the test, no additional tests necessary
  • Intended behavior is unchanged, and bug did not exist in the last release, no documentation necessary
  • An update to CHANGELOG.md is not necessary
  • This PR includes any and all required license headers
  • This PR does not include a database migration
  • This PR DOES NOT FIX A SERIOUS SECURITY VULNERABILITY (see the Apache Software Foundation's security guidelines for details)

Additional Information

@zrhoffman zrhoffman changed the base branch from 5.0.x to master October 21, 2020 17:31
@zrhoffman zrhoffman force-pushed the do-not-require-.git branch from c99ed9e to ff43fa1 Compare October 21, 2020 17:36
Copy link
Copy Markdown
Contributor

@ocket8888 ocket8888 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that the build's finally finished, I can say that it works.

@ocket8888 ocket8888 merged commit dced383 into apache:master Oct 21, 2020
@zrhoffman zrhoffman deleted the do-not-require-.git branch October 21, 2020 19:12
ocket8888 pushed a commit that referenced this pull request Oct 21, 2020
* Use latest clean_build.sh

* Do not require .git repo to build

(cherry picked from commit dced383)
rawlinp added a commit to rawlinp/trafficcontrol that referenced this pull request Oct 26, 2020
* Use latest clean_build.sh

* Do not require .git repo to build

(cherry picked from commit dced383)
@rawlinp rawlinp added bug something isn't working as intended build related to the build process labels Oct 26, 2020
rawlinp added a commit that referenced this pull request Oct 26, 2020
* Use latest clean_build.sh

* Do not require .git repo to build

(cherry picked from commit dced383)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

bug something isn't working as intended build related to the build process

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants