You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/04/23 20:43:37 UTC
[GitHub] [airflow] CodingJonas opened a new pull request #8533: Stop DockerSwarmOperator from pulling Docker images
CodingJonas opened a new pull request #8533:
URL: https://github.com/apache/airflow/pull/8533
---
Refers to issue #8420.
Some functionality of `DockerOperator.execute()` was moved into its own function in order to use it in the overwritten `DockerSwarmOperator.execute()` function. No functionality changed except the DockerSwarmOperator will not unnecessarily download Docker images anymore!
I also renamed `DockerSwarmOperator._run_image()` to `DockerSwarmOperator._run_service()` since it is more descriptive. Not sure if I went to far with this change for the pull request?
---
- [X] Description above provides context of the change
- [X] Unit tests coverage for changes (not needed for documentation changes)
- [X] Target Github ISSUE in description if exists
- [X] Commits follow "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)"
- [X] Relevant documentation is updated including usage instructions.
- [X] I will engage committers as explained in [Contribution Workflow Example](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#contribution-workflow-example).
---
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+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 [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
Read the [Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines) for more information.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] boring-cyborg[bot] commented on pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
boring-cyborg[bot] commented on pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#issuecomment-620207440
Awesome work, congrats on your first merged pull request!
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] CodingJonas commented on pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
CodingJonas commented on pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#issuecomment-619425445
Great, then it is now ready to be merged :)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on a change in pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
mik-laj commented on a change in pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#discussion_r415206235
##########
File path: airflow/providers/docker/operators/docker.py
##########
@@ -289,6 +279,18 @@ def execute(self, context):
return self._run_image()
+ def _set_cli(self):
+ tls_config = self.__get_tls_config()
+
+ if self.docker_conn_id:
+ self.cli = self.get_hook().get_conn()
+ else:
+ self.cli = APIClient(
Review comment:
```suggestion
def _set_cli(self):
if self.docker_conn_id:
self.cli = self.get_hook().get_conn()
else:
tls_config = self.__get_tls_config()
self.cli = APIClient(
```
This way the code is easier to understand when reading the code. The "self.set" construct is replaced with `self.cli = self.get_`
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] CodingJonas commented on a change in pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
CodingJonas commented on a change in pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#discussion_r415755244
##########
File path: airflow/providers/docker/operators/docker.py
##########
@@ -289,6 +279,18 @@ def execute(self, context):
return self._run_image()
+ def _set_cli(self):
+ tls_config = self.__get_tls_config()
+
+ if self.docker_conn_id:
+ self.cli = self.get_hook().get_conn()
+ else:
+ self.cli = APIClient(
Review comment:
You are right, this is nicer :)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] boring-cyborg[bot] commented on pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
boring-cyborg[bot] commented on pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#issuecomment-618658070
Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst)
Here are some useful points:
- Pay attention to the quality of your code (flake8, pylint and type annotations). Our [pre-commits]( https://github.com/apache/airflow/blob/master/STATIC_CODE_CHECKS.rst#prerequisites-for-pre-commit-hooks) will help you with that.
- In case of a new feature add useful documentation (in docstrings or in `docs/` directory). Adding a new operator? Check this short [guide](https://github.com/apache/airflow/blob/master/docs/howto/custom-operator.rst) Consider adding an example DAG that shows how users should use it.
- Consider using [Breeze environment](https://github.com/apache/airflow/blob/master/BREEZE.rst) for testing locally, itโs a heavy docker but it ships with a working Airflow and a lot of integrations.
- Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
- Be sure to read the [Airflow Coding style]( https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#coding-style-and-best-practices).
Apache Airflow is a community-driven project and together we are making it better ๐.
In case of doubts contact the developers at:
Mailing List: dev@airflow.apache.org
Slack: https://apache-airflow-slack.herokuapp.com/
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] CodingJonas commented on a change in pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
CodingJonas commented on a change in pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#discussion_r415755244
##########
File path: airflow/providers/docker/operators/docker.py
##########
@@ -289,6 +279,18 @@ def execute(self, context):
return self._run_image()
+ def _set_cli(self):
+ tls_config = self.__get_tls_config()
+
+ if self.docker_conn_id:
+ self.cli = self.get_hook().get_conn()
+ else:
+ self.cli = APIClient(
Review comment:
You are right, this is nicer :) I updated it in another commit. If everything is fine I would squash the two commits into one before merging.
##########
File path: airflow/providers/docker/operators/docker.py
##########
@@ -289,6 +279,18 @@ def execute(self, context):
return self._run_image()
+ def _set_cli(self):
+ tls_config = self.__get_tls_config()
+
+ if self.docker_conn_id:
+ self.cli = self.get_hook().get_conn()
+ else:
+ self.cli = APIClient(
Review comment:
You are right, this is nicer :) I updated it in a second commit. If everything is fine I would squash the two commits into one before merging.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] CodingJonas commented on a change in pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
CodingJonas commented on a change in pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#discussion_r415755244
##########
File path: airflow/providers/docker/operators/docker.py
##########
@@ -289,6 +279,18 @@ def execute(self, context):
return self._run_image()
+ def _set_cli(self):
+ tls_config = self.__get_tls_config()
+
+ if self.docker_conn_id:
+ self.cli = self.get_hook().get_conn()
+ else:
+ self.cli = APIClient(
Review comment:
I was just copy pasting this part. You are right, this is nicer :)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on a change in pull request #8533: Stop DockerSwarmOperator from pulling Docker images
Posted by GitBox <gi...@apache.org>.
mik-laj commented on a change in pull request #8533:
URL: https://github.com/apache/airflow/pull/8533#discussion_r415206235
##########
File path: airflow/providers/docker/operators/docker.py
##########
@@ -289,6 +279,18 @@ def execute(self, context):
return self._run_image()
+ def _set_cli(self):
+ tls_config = self.__get_tls_config()
+
+ if self.docker_conn_id:
+ self.cli = self.get_hook().get_conn()
+ else:
+ self.cli = APIClient(
Review comment:
```suggestion
def _set_cli(self):
if self.docker_conn_id:
self.cli = self.get_hook().get_conn()
else:
tls_config = self.__get_tls_config()
self.cli = APIClient(
```
The first case is easier to understand when reading the code.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org