You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2022/07/20 18:35:14 UTC

[GitHub] [trafficcontrol] shamrickus opened a new pull request, #6974: Fix Pkg Build Order to Mirror docker-compose.yml

shamrickus opened a new pull request, #6974:
URL: https://github.com/apache/trafficcontrol/pull/6974

   <!--
   Thank you for contributing! Please be sure to read our contribution guidelines: https://github.com/apache/trafficcontrol/blob/master/CONTRIBUTING.md
   If this closes or relates to an existing issue, please reference it using one of the following:
   
   Closes: #ISSUE
   Related: #ISSUE
   
   If this PR fixes a security vulnerability, DO NOT submit! Instead, contact
   the Apache Traffic Control Security Team at security@trafficcontrol.apache.org and follow the
   guidelines at https://apache.org/security regarding vulnerability disclosure.
   -->
   
   This changes `pkg` to (by default) build services in the order listed in `infrastructure/docker/build/docker-compose.yml` as opposed to alphabetical order. 
   
   This issue was originally fixed in #5368, but was reintroduced in #6274 as `docker-compose config --services` lists services in alphabetical order.
   <!-- **^ Add meaningful description above** --><hr/>
   
   ## Which Traffic Control components are affected by this PR?
   <!-- Please delete all components from this list that are NOT affected by this PR.
   Feel free to add the name of a tool or script that is affected but not on the list.
   -->
   - Build
   
   ## What is the best way to verify this PR?
   Run `./pkg source` and then extract the produced source and run `./pkg -v` again. Weasel should not fail from build artifacts such as [these](https://lists.apache.org/thread/okndcgcxn3qr5nkqg1tokbf0w6p38h9n)
   <!-- Please include here ALL the steps necessary to test your PR.
   If your PR has tests (and most should), provide the steps needed to run the tests.
   If not, please provide step-by-step instructions to test the PR manually and explain why your PR does not need tests. -->
   
   
   ## If this is a bugfix, which Traffic Control versions contained the bug?
   <!-- Delete this section if the PR is not a bugfix, or if the bug is only in the master branch.
   Examples:
   - 5.1.2
   - 5.1.3 (RC1)
    -->
    - 6.1.0
    - 7.0.0 RC0
    - master
   
   
   ## PR submission checklist
   - [x] This PR has tests <!-- If not, please delete this text and explain why this PR does not need tests. -->
   - [x] This PR has documentation <!-- If not, please delete this text and explain why this PR does not need documentation. -->
   - [x] This PR has a CHANGELOG.md entry <!-- A fix for a bug from an ATC release, an improvement, or a new feature should have a changelog entry. -->
   - [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://apache.org/security) for details)
   
   <!--
   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.
   -->
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman merged pull request #6974: Fix Pkg Build Order to Mirror docker-compose.yml

Posted by GitBox <gi...@apache.org>.
zrhoffman merged PR #6974:
URL: https://github.com/apache/trafficcontrol/pull/6974


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a diff in pull request #6974: Fix Pkg Build Order to Mirror docker-compose.yml

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on code in PR #6974:
URL: https://github.com/apache/trafficcontrol/pull/6974#discussion_r925965704


##########
pkg:
##########
@@ -155,7 +155,7 @@ while getopts h78abdf:lopqvsSL opt; do
 	esac
 done
 
-PROJECTS="$(cat infrastructure/docker/build/docker-compose.yml | grep -E '^\s\s[a-zA-Z_-]+:$' | sed 's/[: ]//g')"
+PROJECTS="weasel"$'\n'"$("${COMPOSECMD[@]}" -f $COMPOSE_FILE config --services | sed '/^weasel$/d')"

Review Comment:
   This looks good, but would you mind including a comment that explains why it's like that?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a diff in pull request #6974: Fix Pkg Build Order to Mirror docker-compose.yml

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on code in PR #6974:
URL: https://github.com/apache/trafficcontrol/pull/6974#discussion_r925948775


##########
pkg:
##########
@@ -155,7 +155,7 @@ while getopts h78abdf:lopqvsSL opt; do
 	esac
 done
 
-PROJECTS="$("${COMPOSECMD[@]}" -f $COMPOSE_FILE config --services)"
+PROJECTS="$(cat infrastructure/docker/build/docker-compose.yml | grep -E '^\s\s[a-zA-Z_-]+:$' | sed 's/[: ]//g')"

Review Comment:
   Parsing YAML with `grep` and `sed` does not seem so maintainable. What are your thoughts about rearranging the output of `docker-compose config --services` to have `weasel` first?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] shamrickus commented on a diff in pull request #6974: Fix Pkg Build Order to Mirror docker-compose.yml

Posted by GitBox <gi...@apache.org>.
shamrickus commented on code in PR #6974:
URL: https://github.com/apache/trafficcontrol/pull/6974#discussion_r925951160


##########
pkg:
##########
@@ -155,7 +155,7 @@ while getopts h78abdf:lopqvsSL opt; do
 	esac
 done
 
-PROJECTS="$("${COMPOSECMD[@]}" -f $COMPOSE_FILE config --services)"
+PROJECTS="$(cat infrastructure/docker/build/docker-compose.yml | grep -E '^\s\s[a-zA-Z_-]+:$' | sed 's/[: ]//g')"

Review Comment:
   That sounds like a better solution to me



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on pull request #6974: Fix Pkg Build Order to Mirror docker-compose.yml

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on PR #6974:
URL: https://github.com/apache/trafficcontrol/pull/6974#issuecomment-1190629104

   > but was reintroduced in #6274 as `docker-compose config --services` lists services in alphabetical order.
   
   Upon closer inspection, `pkg` has used
   
   ```shell
   docker-compose config --services
   ```
   
   to list services since its creation. The Go implementation of `docker-compose config --services` alphabetizes the services, while the (now-unsupported) Python version,
   
   ```shell
   python -m compose config --services
   ```
   does not.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org