This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 2f113fb688274dfc374b785b3771cc7fb9f2bf10 Author: Jarek Potiuk <[email protected]> AuthorDate: Mon Jul 13 19:23:55 2020 +0200 Fix small errors in image building documentation (#9792) (cherry picked from commit 56f7a2b6e6955f2233d603886266a8d8b286a29b) --- BREEZE.rst | 9 ++++++++- IMAGES.rst | 10 ++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/BREEZE.rst b/BREEZE.rst index dbd8b1e..dfe3c11 100644 --- a/BREEZE.rst +++ b/BREEZE.rst @@ -562,7 +562,7 @@ This install additional pypi dependency - torchio in specified version. .. code-block:: bash - ./breeze build-image --production-image --additional-dev-deps "libasound2" \ + ./breeze build-image --production-image --additional-dev-deps "libasound2-dev" \ --additional-runtime-deps "libasound2" This install additional apt dependencies - ``libasound2-dev`` in build image and ``libasound`` in the @@ -573,6 +573,13 @@ as an intermediate step to build the final image. Usually names of the ``dev`` d suffix and they need to also be paired with corresponding runtime dependency added for the runtime image (without -dev). +.. code-block:: bash + + ./breeze build-image --production-image --python 3.7 --additional-dev-deps "libasound2-dev" \ + --additional-runtime-deps "libasound2" + +Same as above but uses python 3.7. + .. raw:: html <div align="center"> diff --git a/IMAGES.rst b/IMAGES.rst index 5c722b7..b1890e1 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -555,10 +555,9 @@ additional apt dev and runtime dependencies. --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALL_SOURCES="apache-airflow" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.10" \ - --build-arg CONSTRAINT_REQUIREMENTS="https://raw.githubusercontent.com/apache/airflow/1.10.10/requirements/requirements-python3.7.txt"; \ - --build-arg ENTRYPOINT_FILE="https://raw.githubusercontent.com/apache/airflow/1.10.10/entrypoint.sh"; \ - --build-arg AIRFLOW_SOURCES_FROM="entrypoint.sh" \ - --build-arg AIRFLOW_SOURCES_TO="/entrypoint" \ + --build-arg CONSTRAINT_REQUIREMENTS="https://raw.githubusercontent.com/apache/airflow/1.10.11/requirements/requirements-python3.7.txt"; \ + --build-arg AIRFLOW_SOURCES_FROM="empty" \ + --build-arg AIRFLOW_SOURCES_TO="/empty" \ --build-arg ADDITIONAL_AIRFLOW_EXTRAS="jdbc" --build-arg ADDITIONAL_DEV_DEPS="gcc g++" --build-arg ADDITIONAL_RUNTIME_DEPS="default-jre-headless" @@ -647,6 +646,9 @@ The entrypoint performs those operations: Using the PROD image ==================== +The entrypoint in the PROD image contains all the initialisation needed for tests to be immediately executed. +It is copied from ``scripts/ci/in_container/entrypoint_prod.sh``. + The PROD image entrypoint works as follows: * In case the user is not "airflow" (with undefined user id) and the group id of the user is set to 0 (root),
