You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "potiuk (via GitHub)" <gi...@apache.org> on 2023/12/08 19:47:56 UTC
[PR] Unify how docker commands get executed in Breeze [airflow]
potiuk opened a new pull request, #36131:
URL: https://github.com/apache/airflow/pull/36131
So far we executed commands in CI image in breeze in two ways:
* entering the shell (which runs docker-compose under the hood)
* running `docker run` with the CI image
This requires rather complex mapping of environment variables between `docker-compose` and `docker`. Since recently (#35862) we can use `shell` command to run commands in very similar way as docker run (with docker-compose, without database and extra components - just using the same `breeze shell` mechanisms.
This PR converts all the usages of docker run CI_IMAGE we had and converts them to use modified `enter_shell` method that has been moved to "docker_command_utils". This also simplified passing arguments to the "enter_shell" command - no longer need to filter out none parameters and **kwargs - all parameters are passed explicitly.
This also allowed to remove some of the code (extracting args, filtering_out_none) that are not used anymore.
<!--
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.
-->
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of an existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
<!-- Please keep an empty line above the dashes. -->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [newsfragments](https://github.com/apache/airflow/tree/main/newsfragments).
--
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: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Unify how docker commands get executed in Breeze [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #36131:
URL: https://github.com/apache/airflow/pull/36131#discussion_r1421389322
##########
dev/breeze/src/airflow_breeze/commands/release_management_commands.py:
##########
@@ -170,60 +161,6 @@ class VersionedFile(NamedTuple):
comparable_version: Version
-def run_docker_command_with_debug(
Review Comment:
This one will not be needed anymore
--
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: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Unify how docker commands get executed in Breeze [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #36131:
URL: https://github.com/apache/airflow/pull/36131
--
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: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Unify how docker commands get executed in Breeze [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #36131:
URL: https://github.com/apache/airflow/pull/36131#discussion_r1421389322
##########
dev/breeze/src/airflow_breeze/commands/release_management_commands.py:
##########
@@ -170,60 +161,6 @@ class VersionedFile(NamedTuple):
comparable_version: Version
-def run_docker_command_with_debug(
Review Comment:
This one will not be needed any more
--
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: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Unify how docker commands get executed in Breeze [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #36131:
URL: https://github.com/apache/airflow/pull/36131#issuecomment-1848950065
Right. Solved all the problems - should be ready to review now :).
This is one more cleanup (including removal of +200 lines of redundant codee) where we have an easier way to understand and add new commands for breeze in the future.
--
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: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org