From d6b1860def7931fc95409c0fda3f50bba9ce598e Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 1 Aug 2019 12:57:43 +0200 Subject: [PATCH] [AIRFLOW-5091] Build epoch is fixed now We do not need monthly build epoch as we rebuild from the scratch anyway every time new python patchlevel is released. This happens every 1-2 months. --- Dockerfile | 7 +++---- hooks/build | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 063161298c3a8..4a7a3ea8e5c48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -303,10 +303,9 @@ RUN echo "Installing with extras: ${AIRFLOW_EXTRAS}." ARG AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD="false" ENV AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD=${AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD} -# By changing the CI build epoch we can force reinstalling Arflow from the current master - -# in case of CI optimized builds (next step). Our build scripts will change the EPOCH every month normally -# But it can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. -ARG AIRFLOW_CI_BUILD_EPOCH="" +# By changing the CI build epoch we can force reinstalling Arflow from the current master +# It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. +ARG AIRFLOW_CI_BUILD_EPOCH="1" ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH} # In case of CI-optimised builds we want to pre-install master version of airflow dependencies so that diff --git a/hooks/build b/hooks/build index 19e28a7af9a3b..314a7e522c428 100755 --- a/hooks/build +++ b/hooks/build @@ -46,7 +46,6 @@ LAST_STEP_NAME="" STEP_STARTED="false" PYTHON_VERSION_FOR_DEFAULT_IMAGE=3.6 AIRFLOW_CI_VERBOSE=${AIRFLOW_CI_VERBOSE:="false"} -AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH:=$(date +"%Y%m")} function end_step { if [[ "${STEP_STARTED}" != "true" ]]; then @@ -126,7 +125,6 @@ function build_image { --build-arg AIRFLOW_USER="${AIRFLOW_USER}" \ --build-arg AIRFLOW_BRANCH="${AIRFLOW_CONTAINER_BRANCH_NAME}" \ --build-arg BUILD_NPM="${AIRFLOW_CONTAINER_BUILD_NPM}" \ - --build-arg AIRFLOW_CI_BUILD_EPOCH="${AIRFLOW_CI_BUILD_EPOCH}" \ --build-arg AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD="${AIRFLOW_CONTAINER_CI_OPTIMISED_BUILD}" \ --build-arg HOME="${HOME}" \ "${DOCKER_CACHE_DIRECTIVE[@]}" \