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/10/23 12:17:18 UTC
[GitHub] [airflow] potiuk opened a new pull request #11779: The .pypirc file is read from docker-context-files
potiuk opened a new pull request #11779:
URL: https://github.com/apache/airflow/pull/11779
If you used context from git repo, the .piprc file was missing and
COPY in Dockerfile is not conditional.
This change copies the .pypirc conditionally from the
docker-context-files folder instead.
Also it was needlessly copied in the main image where it is not
needed and it was even dangerous to do so.
<!--
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 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/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
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).
----------------------------------------------------------------
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] feluelle commented on a change in pull request #11779: The .pypirc file is read from docker-context-files
Posted by GitBox <gi...@apache.org>.
feluelle commented on a change in pull request #11779:
URL: https://github.com/apache/airflow/pull/11779#discussion_r510845970
##########
File path: Dockerfile
##########
@@ -164,7 +164,9 @@ RUN mkdir -p /root/.local/bin
ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true"
ENV AIRFLOW_PRE_CACHED_PIP_PACKAGES=${AIRFLOW_PRE_CACHED_PIP_PACKAGES}
-COPY .pypirc /root/.pypirc
+RUN if [[ -f /docker-context-files/.pypirc ]]; then \
+ cp /docker-context-files/.pypirc /root/.pypirc; \
+ fi
Review comment:
Great usage for the newly added `docker-context-files` dir :)
----------------------------------------------------------------
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] feluelle commented on pull request #11779: The .pypirc file is read from docker-context-files
Posted by GitBox <gi...@apache.org>.
feluelle commented on pull request #11779:
URL: https://github.com/apache/airflow/pull/11779#issuecomment-715309684
Tested it with docker-compose, set remote context to `context: https://github.com/PolideaInternal/airflow.git#pypirc-from-docker-context-files`
----------------------------------------------------------------
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] potiuk merged pull request #11779: The .pypirc file is read from docker-context-files
Posted by GitBox <gi...@apache.org>.
potiuk merged pull request #11779:
URL: https://github.com/apache/airflow/pull/11779
----------------------------------------------------------------
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