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 9e283fb5b9b8e112d092fb7b0f2a0a29cc2c2dbd Author: Ash Berlin-Taylor <[email protected]> AuthorDate: Wed Dec 9 05:19:38 2020 +0000 Apply labels to Docker images in a single instruction (#12931) * Apply labels to Docker images in a single instruction While looking at the build logs for something else I noticed this oddity at the end of the CI logs: ``` Tue, 08 Dec 2020 21:20:19 GMT Step 125/135 : LABEL org.apache.airflow.distro="debian" ... Tue, 08 Dec 2020 21:21:14 GMT Step 133/135 : LABEL org.apache.airflow.commitSha=${COMMIT_SHA} Tue, 08 Dec 2020 21:21:14 GMT ---> Running in 1241a5f6cdb7 Tue, 08 Dec 2020 21:21:21 GMT Removing intermediate container 1241a5f6cdb7 ``` Applying all the labels took 1m2s! Hopefully applying these in a single layer/command should speed things up. A less extreme example still took 43s ``` Tue, 08 Dec 2020 20:44:40 GMT Step 125/135 : LABEL org.apache.airflow.distro="debian" ... Tue, 08 Dec 2020 20:45:18 GMT Step 133/135 : LABEL org.apache.airflow.commitSha=${COMMIT_SHA} Tue, 08 Dec 2020 20:45:18 GMT ---> Running in dc601207dbcb Tue, 08 Dec 2020 20:45:23 GMT Removing intermediate container dc601207dbcb Tue, 08 Dec 2020 20:45:23 GMT ---> 5aae5dd0f702 ``` * Update Dockerfile (cherry picked from commit 63ea88d1b1bdad5ce24f498fdf3600217069b4ad) --- Dockerfile | 47 ++++++++++++++++++++++++----------------------- Dockerfile.ci | 18 +++++++++--------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 35f50b3..eaac1e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -260,19 +260,20 @@ RUN AIRFLOW_SITE_PACKAGE="/root/.local/lib/python${PYTHON_MAJOR_MINOR_VERSION}/s RUN find /root/.local -executable -print0 | xargs --null chmod g+x && \ find /root/.local -print0 | xargs --null chmod g+rw -LABEL org.apache.airflow.distro="debian" -LABEL org.apache.airflow.distro.version="buster" -LABEL org.apache.airflow.module="airflow" -LABEL org.apache.airflow.component="airflow" -LABEL org.apache.airflow.image="airflow-build-image" ARG BUILD_ID ENV BUILD_ID=${BUILD_ID} ARG COMMIT_SHA ENV COMMIT_SHA=${COMMIT_SHA} -LABEL org.apache.airflow.buildImage.buildId=${BUILD_ID} -LABEL org.apache.airflow.buildImage.commitSha=${COMMIT_SHA} + +LABEL org.apache.airflow.distro="debian" \ + org.apache.airflow.distro.version="buster" \ + org.apache.airflow.module="airflow" \ + org.apache.airflow.component="airflow" \ + org.apache.airflow.image="airflow-build-image" \ + org.apache.airflow.buildImage.buildId=${BUILD_ID} \ + org.apache.airflow.buildImage.commitSha=${COMMIT_SHA} ############################################################################################## # This is the actual Airflow image - much smaller than the build one. We copy @@ -284,13 +285,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-e", "-u", "-x", "-c"] ARG AIRFLOW_UID ARG AIRFLOW_GID -LABEL org.apache.airflow.distro="debian" -LABEL org.apache.airflow.distro.version="buster" -LABEL org.apache.airflow.module="airflow" -LABEL org.apache.airflow.component="airflow" -LABEL org.apache.airflow.image="airflow" -LABEL org.apache.airflow.uid="${AIRFLOW_UID}" -LABEL org.apache.airflow.gid="${AIRFLOW_GID}" +LABEL org.apache.airflow.distro="debian" \ + org.apache.airflow.distro.version="buster" \ + org.apache.airflow.module="airflow" \ + org.apache.airflow.component="airflow" \ + org.apache.airflow.image="airflow" \ + org.apache.airflow.uid="${AIRFLOW_UID}" \ + org.apache.airflow.gid="${AIRFLOW_GID}" ARG PYTHON_BASE_IMAGE ENV PYTHON_BASE_IMAGE=${PYTHON_BASE_IMAGE} @@ -425,15 +426,15 @@ ENV BUILD_ID=${BUILD_ID} ARG COMMIT_SHA ENV COMMIT_SHA=${COMMIT_SHA} -LABEL org.apache.airflow.distro="debian" -LABEL org.apache.airflow.distro.version="buster" -LABEL org.apache.airflow.module="airflow" -LABEL org.apache.airflow.component="airflow" -LABEL org.apache.airflow.image="airflow" -LABEL org.apache.airflow.uid="${AIRFLOW_UID}" -LABEL org.apache.airflow.gid="${AIRFLOW_GID}" -LABEL org.apache.airflow.mainImage.buildId=${BUILD_ID} -LABEL org.apache.airflow.mainImage.commitSha=${COMMIT_SHA} +LABEL org.apache.airflow.distro="debian" \ + org.apache.airflow.distro.version="buster" \ + org.apache.airflow.module="airflow" \ + org.apache.airflow.component="airflow" \ + org.apache.airflow.image="airflow" \ + org.apache.airflow.uid="${AIRFLOW_UID}" \ + org.apache.airflow.gid="${AIRFLOW_GID}" \ + org.apache.airflow.mainImage.buildId=${BUILD_ID} \ + org.apache.airflow.mainImage.commitSha=${COMMIT_SHA} ENTRYPOINT ["/usr/bin/dumb-init", "--", "/entrypoint"] CMD ["--help"] diff --git a/Dockerfile.ci b/Dockerfile.ci index c71fae6..bd00238 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -387,15 +387,15 @@ ENV BUILD_ID=${BUILD_ID} ARG COMMIT_SHA ENV COMMIT_SHA=${COMMIT_SHA} -LABEL org.apache.airflow.distro="debian" -LABEL org.apache.airflow.distro.version="buster" -LABEL org.apache.airflow.module="airflow" -LABEL org.apache.airflow.component="airflow" -LABEL org.apache.airflow.image="airflow-ci" -LABEL org.apache.airflow.uid="0" -LABEL org.apache.airflow.gid="0" -LABEL org.apache.airflow.buildId=${BUILD_ID} -LABEL org.apache.airflow.commitSha=${COMMIT_SHA} +LABEL org.apache.airflow.distro="debian" \ + org.apache.airflow.distro.version="buster" \ + org.apache.airflow.module="airflow" \ + org.apache.airflow.component="airflow" \ + org.apache.airflow.image="airflow-ci" \ + org.apache.airflow.uid="0" \ + org.apache.airflow.gid="0" \ + org.apache.airflow.buildId=${BUILD_ID} \ + org.apache.airflow.commitSha=${COMMIT_SHA} EXPOSE 8080
