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/01/05 03:46:51 UTC

[GitHub] [airflow] mik-laj opened a new pull request #7057: [AIRFLOW-6462][depends on AIRFLOW-6461] Limit exported variables in Dockerfile/Breeze

mik-laj opened a new pull request #7057: [AIRFLOW-6462][depends on AIRFLOW-6461] Limit exported variables in Dockerfile/Breeze
URL: https://github.com/apache/airflow/pull/7057
 
 
   
   We have a lot of variables after typing the command `export` in a clean environment. I would like to limit their number. to make the result of the export command more readable.
   
   
   After:
   ```bash
   declare -x ADDITIONAL_PATH="~/.local/bin"
   declare -x AIRFLOW_BRANCH="master"
   declare -x AIRFLOW_CI_BUILD_EPOCH="1"
   declare -x AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD="true"
   declare -x AIRFLOW_CONTAINER_DOCKER_IMAGE="apache/airflow:master-python3.6-ci"
   declare -x AIRFLOW_EXTRAS="devel_ci"
   declare -x AIRFLOW_HOME="/root/airflow"
   declare -x AIRFLOW_REPO="apache/airflow"
   declare -x AIRFLOW_SOURCES="/opt/airflow"
   declare -x AIRFLOW_VERSION="2.0.0.dev0"
   declare -x AIRFLOW__CORE__DAGS_FOLDER="/opt/airflow/tests/dags"
   declare -x AIRFLOW__CORE__EXECUTOR="SequentialExecutor"
   declare -x AIRFLOW__CORE__SQL_ALCHEMY_CONN="sqlite:////root/airflow/airflow.db"
   declare -x AIRFLOW__CORE__UNIT_TEST_MODE="True"
   declare -x AWS_DEFAULT_REGION="us-east-1"
   declare -x BACKEND="sqlite"
   declare -x BREEZE="true"
   declare -x CASS_DRIVER_BUILD_CONCURRENCY="8"
   declare -x CASS_DRIVER_NO_CYTHON="1"
   declare -x CELERY_BROKER_URLS="amqp://guest:guest@rabbitmq:5672,redis://redis:6379/0"
   declare -x DEBIAN_FRONTEND="noninteractive"
   declare -x DEPENDENCIES_EPOCH_NUMBER="2"
   declare -x DISABLE_CHECKS_FOR_TESTS="missing-docstring,no-self-use,too-many-public-methods,protected-access,do-not-use-asserts"
   declare -x DOCKER_HOST="tcp://docker:2375"
   declare -x ENV="docker"
   declare -x GPG_KEY="0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D"
   declare -x HADOOP_DISTRO="cdh"
   declare -x HADOOP_HOME="/opt/hadoop-cdh"
   declare -x HADOOP_OPTS="-D/opt/krb5.conf"
   declare -x HIVE_HOME="/opt/hive"
   declare -x HOME="/root"
   declare -x HOSTNAME="e484de340f32"
   declare -x JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/"
   declare -x KRB5_CONFIG="/etc/krb5.conf"
   declare -x KRB5_KTNAME="/etc/airflow.keytab"
   declare -x KUBERNETES_MODE="git_mode"
   declare -x KUBERNETES_VERSION="v1.13.0"
   declare -x LANG="C.UTF-8"
   declare -x LANGUAGE="C.UTF-8"
   declare -x LC_ALL="C.UTF-8"
   declare -x LC_CTYPE="C.UTF-8"
   declare -x LC_MESSAGES="C.UTF-8"
   declare -x MINICLUSTER_HOME="/opt/minicluster"
   declare -x OLDPWD="/opt/airflow"
   declare -x PATH="/root:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hive/bin:/opt/airflow"
   declare -x PIP_DEPENDENCIES_EPOCH_NUMBER="2"
   declare -x PIP_NO_CACHE_DIR="true"
   declare -x PIP_VERSION="19.0.2"
   declare -x PWD="/opt/airflow"
   declare -x PYTHONDONTWRITEBYTECODE="true"
   declare -x PYTHON_BASE_IMAGE="python:3.6-slim-stretch"
   declare -x PYTHON_GET_PIP_SHA256="b86f36cc4345ae87bfd4f10ef6b2dbfa7a872fbff70608a1e43944d283fd0eee"
   declare -x PYTHON_GET_PIP_URL="https://github.com/pypa/get-pip/raw/ffe826207a010164265d9cc807978e3604d18ca0/get-pip.py"
   declare -x PYTHON_PIP_VERSION="19.3.1"
   declare -x PYTHON_VERSION="3.6.10"
   declare -x RUN_TESTS="false"
   declare -x SHLVL="2"
   declare -x SOURCE_BRANCH="master"
   declare -x TERM="xterm"
   declare -x USER="root"
   declare -x XUNIT_FILE="/root/airflow/logs/all_tests.xml"
   ```
   Before:
   ```bash
   declare -x ADDITIONAL_PATH="~/.local/bin"
   declare -x AIRFLOW_BRANCH="master"
   declare -x AIRFLOW_CI_BUILD_EPOCH="1"
   declare -x AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD="true"
   declare -x AIRFLOW_CONTAINER_DOCKER_IMAGE="apache/airflow:master-python3.6-ci"
   declare -x AIRFLOW_EXTRAS="devel_ci"
   declare -x AIRFLOW_GITHUB_DOWNLOAD="https://raw.githubusercontent.com/apache/airflow/master"
   declare -x AIRFLOW_HOME="/root/airflow"
   declare -x AIRFLOW_REPO="apache/airflow"
   declare -x AIRFLOW_SOURCES="/opt/airflow"
   declare -x AIRFLOW_VERSION="2.0.0.dev0"
   declare -x AIRFLOW__CORE__DAGS_FOLDER="/opt/airflow/tests/dags"
   declare -x AIRFLOW__CORE__EXECUTOR="SequentialExecutor"
   declare -x AIRFLOW__CORE__SQL_ALCHEMY_CONN="sqlite:////root/airflow/airflow.db"
   declare -x AIRFLOW__CORE__UNIT_TEST_MODE="True"
   declare -x AWS_DEFAULT_REGION="us-east-1"
   declare -x BACKEND="sqlite"
   declare -x BREEZE="true"
   declare -x CASS_DRIVER_BUILD_CONCURRENCY="8"
   declare -x CASS_DRIVER_NO_CYTHON="1"
   declare -x CELERY_BROKER_URLS="amqp://guest:guest@rabbitmq:5672,redis://redis:6379/0"
   declare -x DEBIAN_FRONTEND="noninteractive"
   declare -x DEPENDENCIES_EPOCH_NUMBER="2"
   declare -x DISABLE_CHECKS_FOR_TESTS="missing-docstring,no-self-use,too-many-public-methods,protected-access,do-not-use-asserts"
   declare -x DOCKER_HOST="tcp://docker:2375"
   declare -x ENV="docker"
   declare -x GPG_KEY="0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D"
   declare -x HADOOP_DISTRO="cdh"
   declare -x HADOOP_DISTRO_VERSION="5.11.0"
   declare -x HADOOP_DOWNLOAD_URL="https://archive.cloudera.com/cdh5/cdh/5/hadoop-2.6.0-cdh5.11.0.tar.gz"
   declare -x HADOOP_HOME="/opt/hadoop-cdh"
   declare -x HADOOP_MAJOR="5"
   declare -x HADOOP_OPTS="-D/opt/krb5.conf"
   declare -x HADOOP_TMP_FILE="/tmp/hadoop.tar.gz"
   declare -x HADOOP_URL="https://archive.cloudera.com/cdh5/cdh/5/"
   declare -x HADOOP_VERSION="2.6.0"
   declare -x HIVE_HOME="/opt/hive"
   declare -x HIVE_TMP_FILE="/tmp/hive.tar.gz"
   declare -x HIVE_URL="https://archive.cloudera.com/cdh5/cdh/5/hive-1.1.0-cdh5.11.0.tar.gz"
   declare -x HIVE_VERSION="1.1.0"
   declare -x HOME="/root"
   declare -x HOSTNAME="10d460be0a01"
   declare -x JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/"
   declare -x KIND_VERSION="v0.5.0"
   declare -x KRB5_CONFIG="/etc/krb5.conf"
   declare -x KRB5_KTNAME="/etc/airflow.keytab"
   declare -x KUBECTL_VERSION="v1.15.0"
   declare -x KUBERNETES_MODE="git_mode"
   declare -x KUBERNETES_VERSION="v1.13.0"
   declare -x LANG="C.UTF-8"
   declare -x LANGUAGE="C.UTF-8"
   declare -x LC_ALL="C.UTF-8"
   declare -x LC_CTYPE="C.UTF-8"
   declare -x LC_MESSAGES="C.UTF-8"
   declare -x MINICLUSTER_BASE="https://github.com/bolkedebruin/minicluster/releases/download/"
   declare -x MINICLUSTER_HOME="/opt/minicluster"
   declare -x MINICLUSTER_TMP_FILE="/tmp/minicluster.zip"
   declare -x MINICLUSTER_URL="https://github.com/bolkedebruin/minicluster/releases/download/1.1/minicluster-1.1-SNAPSHOT-bin.zip"
   declare -x MINICLUSTER_VER="1.1"
   declare -x OLDPWD="/opt/airflow"
   declare -x PATH="/root:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hive/bin:/opt/airflow"
   declare -x PIP_DEPENDENCIES_EPOCH_NUMBER="2"
   declare -x PIP_NO_CACHE_DIR="true"
   declare -x PIP_VERSION="19.0.2"
   declare -x PWD="/opt/airflow"
   declare -x PYTHONDONTWRITEBYTECODE="true"
   declare -x PYTHON_BASE_IMAGE="python:3.6-slim-stretch"
   declare -x PYTHON_GET_PIP_SHA256="b86f36cc4345ae87bfd4f10ef6b2dbfa7a872fbff70608a1e43944d283fd0eee"
   declare -x PYTHON_GET_PIP_URL="https://github.com/pypa/get-pip/raw/ffe826207a010164265d9cc807978e3604d18ca0/get-pip.py"
   declare -x PYTHON_PIP_VERSION="19.3.1"
   declare -x PYTHON_VERSION="3.6.10"
   declare -x RAT_JAR="/opt/apache-rat-0.13.jar"
   declare -x RAT_JAR_MD5="/opt/apache-rat-0.13.jar.md5"
   declare -x RAT_URL="https://repo1.maven.org/maven2/org/apache/rat/apache-rat/0.13/apache-rat-0.13.jar"
   declare -x RAT_URL_MD5="https://repo1.maven.org/maven2/org/apache/rat/apache-rat/0.13/apache-rat-0.13.jar.md5"
   declare -x RAT_VERSION="0.13"
   declare -x RUN_TESTS="false"
   declare -x SHLVL="2"
   declare -x SOURCE_BRANCH="master"
   declare -x TERM="xterm"
   declare -x USER="root"
   declare -x XUNIT_FILE="/root/airflow/logs/all_tests.xml"
   ```
   ---
   Link to JIRA issue: https://issues.apache.org/jira/browse/AIRFLOW-6462
   
   - [X] Description above provides context of the change
   - [X] Commit message starts with `[AIRFLOW-NNNN]`, where AIRFLOW-NNNN = JIRA ID*
   - [X] Unit tests coverage for changes (not needed for documentation changes)
   - [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).
   
   (*) For document-only changes, no JIRA issue is needed. Commit message starts `[AIRFLOW-XXXX]`.
   
   ---
   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


With regards,
Apache Git Services

[GitHub] [airflow] potiuk merged pull request #7057: [AIRFLOW-6462] Limit exported variables in Dockerfile/Breeze

Posted by GitBox <gi...@apache.org>.

potiuk merged pull request #7057: [AIRFLOW-6462] Limit exported variables in Dockerfile/Breeze
URL: https://github.com/apache/airflow/pull/7057
 
 
   

----------------------------------------------------------------
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


With regards,
Apache Git Services

[GitHub] [airflow] mik-laj commented on a change in pull request #7057: [AIRFLOW-6462][depends on AIRFLOW-6461] Limit exported variables in Dockerfile/Breeze

Posted by GitBox <gi...@apache.org>.

mik-laj commented on a change in pull request #7057: [AIRFLOW-6462][depends on AIRFLOW-6461] Limit exported variables in Dockerfile/Breeze
URL: https://github.com/apache/airflow/pull/7057#discussion_r363067745
 
 

 ##########
 File path: Dockerfile
 ##########
 @@ -266,8 +271,6 @@ ENV AIRFLOW_REPO=${AIRFLOW_REPO}
 ARG AIRFLOW_BRANCH=master
 ENV AIRFLOW_BRANCH=${AIRFLOW_BRANCH}
 
-ENV AIRFLOW_GITHUB_DOWNLOAD=https://raw.githubusercontent.com/${AIRFLOW_REPO}/${AIRFLOW_BRANCH}
 
 Review comment:
   It is an unused variable.

----------------------------------------------------------------
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


With regards,
Apache Git Services

[GitHub] [airflow] mik-laj commented on issue #7057: [AIRFLOW-6462] Limit exported variables in Dockerfile/Breeze

Posted by GitBox <gi...@apache.org>.

mik-laj commented on issue #7057: [AIRFLOW-6462] Limit exported variables in Dockerfile/Breeze
URL: https://github.com/apache/airflow/pull/7057#issuecomment-570920489
 
 
   I rebased and added a small fixup related to Apache RAT and Hadoop/Hive.

----------------------------------------------------------------
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


With regards,
Apache Git Services

[GitHub] [airflow] potiuk commented on issue #7057: [AIRFLOW-6462][depends on AIRFLOW-6461] Limit exported variables in Dockerfile/Breeze

Posted by GitBox <gi...@apache.org>.

potiuk commented on issue #7057: [AIRFLOW-6462][depends on AIRFLOW-6461] Limit exported variables in Dockerfile/Breeze
URL: https://github.com/apache/airflow/pull/7057#issuecomment-570892322
 
 
   Needs rebase :)

----------------------------------------------------------------
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


With regards,
Apache Git Services