You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by "lostluck (via GitHub)" <gi...@apache.org> on 2023/04/07 21:35:36 UTC
[GitHub] [beam] lostluck opened a new pull request, #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
lostluck opened a new pull request, #26183:
URL: https://github.com/apache/beam/pull/26183
Fix a spontaneous issue with container creation that occurs with the current docker version. COPY requires *all* source directories to produce values for copying, not simply checking the results.
Touching a file ensures COPY is satisfied, and this reduces the complexity WRT the Docker files. They no longer need to copy a vestigial license file to the destination, and then delete it. Except for the experimental typescript container, the Dockerfiles all delete all third_party licenses directories when the pulls are false anyway.
Fixes #26180
Also replaces the deprecated `MAINTAINER` Dockerfile command with `LABEL Author`, which is all the MAINTAINER command does.
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Mention the appropriate issue in your description (for example: `addresses #123`), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment `fixes #<ISSUE NUMBER>` instead.
- [ ] Update `CHANGES.md` with noteworthy changes.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/get-started-contributing/#make-the-reviewers-job-easier).
To check the build health, please visit [https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md](https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md)
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
[](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Go+tests%22+branch%3Amaster+event%3Aschedule)
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] codecov[bot] commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1500677155
## [Codecov](https://codecov.io/gh/apache/beam/pull/26183?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#26183](https://codecov.io/gh/apache/beam/pull/26183?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (0e7e396) into [master](https://codecov.io/gh/apache/beam/commit/209c8c9cf7eeccc0b58b922d200c6a2785ea4681?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (209c8c9) will **decrease** coverage by `0.01%`.
> The diff coverage is `n/a`.
```diff
@@ Coverage Diff @@
## master #26183 +/- ##
==========================================
- Coverage 71.16% 71.16% -0.01%
==========================================
Files 787 787
Lines 103311 103311
==========================================
- Hits 73523 73522 -1
- Misses 28299 28300 +1
Partials 1489 1489
```
| Flag | Coverage Δ | |
|---|---|---|
| python | `79.84% <ø> (-0.01%)` | :arrow_down: |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more.
[see 4 files with indirect coverage changes](https://codecov.io/gh/apache/beam/pull/26183/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] github-actions[bot] commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1500731898
Assigning reviewers. If you would like to opt out of this review, comment `assign to next reviewer`:
R: @damccorm for label python.
R: @kennknowles for label java.
R: @jrmccluskey for label go.
Available commands:
- `stop reviewer notifications` - opt out of the automated review tooling
- `remind me after tests pass` - tag the comment author after tests pass
- `waiting on author` - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)
The PR bot will only process comments in the main thread (not review comments).
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "lostluck (via GitHub)" <gi...@apache.org>.
lostluck commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1501265192
The dummy is only generated on the skip path. And in the skip path, the
entire folder for licenses is deleted. An explicit delete is redundant.
On Sun, Apr 9, 2023, 5:49 PM Danny McCormick ***@***.***>
wrote:
> ***@***.**** approved this pull request.
>
> LGTM - I'm fine with merging without my comment if you think removing the
> touched file is not worth it for any reason
> ------------------------------
>
> In sdks/go/container/Dockerfile
> <https://github.com/apache/beam/pull/26183#discussion_r1161364457>:
>
> > @@ -34,11 +35,8 @@ ADD target/${TARGETOS}_${TARGETARCH}/boot /opt/apache/beam/
> COPY target/LICENSE /opt/apache/beam/
> COPY target/NOTICE /opt/apache/beam/
>
> -# Add golang licenses. Because the go-license directory may be empty if
> -# pull_licenses is false, and COPY fails if there are no files,
> -# copy an extra LICENSE file then remove it.
> -COPY target/LICENSE target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/
> -RUN rm /opt/apache/beam/third_party_licenses/golang/LICENSE
> +# Add Go licenses.
> +COPY target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/
>
> Should we be rming the touched file? That is also simpler if we do the
> file touch as part of the dockerfile
>
> —
> Reply to this email directly, view it on GitHub
> <https://github.com/apache/beam/pull/26183#pullrequestreview-1376978603>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/ADKDOFLW5D27NT2BPORNAO3XANKH3ANCNFSM6AAAAAAWW6JNDQ>
> .
> You are receiving this because you authored the thread.Message ID:
> ***@***.***>
>
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck merged pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "lostluck (via GitHub)" <gi...@apache.org>.
lostluck merged PR #26183:
URL: https://github.com/apache/beam/pull/26183
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "lostluck (via GitHub)" <gi...@apache.org>.
lostluck commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1500732411
Python portable is failing because the py311 test suite isn't set up correctly.
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "lostluck (via GitHub)" <gi...@apache.org>.
lostluck commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1500731302
assign set of reviewers
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "lostluck (via GitHub)" <gi...@apache.org>.
lostluck commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1500731260
Run Portable_Python PreCommit
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] github-actions[bot] commented on pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #26183:
URL: https://github.com/apache/beam/pull/26183#issuecomment-1500712613
Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment `assign set of reviewers`
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] damccorm commented on a diff in pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "damccorm (via GitHub)" <gi...@apache.org>.
damccorm commented on code in PR #26183:
URL: https://github.com/apache/beam/pull/26183#discussion_r1161364457
##########
sdks/go/container/Dockerfile:
##########
@@ -34,11 +35,8 @@ ADD target/${TARGETOS}_${TARGETARCH}/boot /opt/apache/beam/
COPY target/LICENSE /opt/apache/beam/
COPY target/NOTICE /opt/apache/beam/
-# Add golang licenses. Because the go-license directory may be empty if
-# pull_licenses is false, and COPY fails if there are no files,
-# copy an extra LICENSE file then remove it.
-COPY target/LICENSE target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/
-RUN rm /opt/apache/beam/third_party_licenses/golang/LICENSE
+# Add Go licenses.
+COPY target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/
Review Comment:
Should we be `rm`ing the touched file? That is also simpler if we do the file touch as part of the dockerfile
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck commented on a diff in pull request #26183: (#26180) Fix go-licenses container COPY, by touching a dummy file.
Posted by "lostluck (via GitHub)" <gi...@apache.org>.
lostluck commented on code in PR #26183:
URL: https://github.com/apache/beam/pull/26183#discussion_r1161927266
##########
sdks/go/container/Dockerfile:
##########
@@ -34,11 +35,8 @@ ADD target/${TARGETOS}_${TARGETARCH}/boot /opt/apache/beam/
COPY target/LICENSE /opt/apache/beam/
COPY target/NOTICE /opt/apache/beam/
-# Add golang licenses. Because the go-license directory may be empty if
-# pull_licenses is false, and COPY fails if there are no files,
-# copy an extra LICENSE file then remove it.
-COPY target/LICENSE target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/
-RUN rm /opt/apache/beam/third_party_licenses/golang/LICENSE
+# Add Go licenses.
+COPY target/go-licenses/* /opt/apache/beam/third_party_licenses/golang/
Review Comment:
The dummy is only generated on the skip path. And in the skip path, the
entire folder for licenses is deleted. An explicit delete is redundant.
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org