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 2019/09/08 12:04:06 UTC
[GitHub] [airflow] potiuk commented on a change in pull request #6056:
[AIRFLOW-5440] Static checks from docker file use dumb-init
potiuk commented on a change in pull request #6056: [AIRFLOW-5440] Static checks from docker file use dumb-init
URL: https://github.com/apache/airflow/pull/6056#discussion_r322006299
##########
File path: scripts/ci/_utils.sh
##########
@@ -610,102 +611,114 @@ function run_flake8() {
if [[ "${#FILES[@]}" == "0" ]]; then
docker run "${AIRFLOW_CONTAINER_EXTRA_DOCKER_FLAGS[@]}" \
- --entrypoint /opt/airflow/scripts/ci/in_container/run_flake8.sh \
+ --entrypoint "/usr/local/bin/dumb-init" \
--env PYTHONDONTWRITEBYTECODE \
--env AIRFLOW_CI_VERBOSE="${VERBOSE}" \
--env AIRFLOW_CI_SILENT \
--env HOST_USER_ID="$(id -ur)" \
--env HOST_GROUP_ID="$(id -gr)" \
--rm \
- "${AIRFLOW_SLIM_CI_IMAGE}" | tee -a "${OUTPUT_LOG}"
+ "${AIRFLOW_SLIM_CI_IMAGE}" \
+ "--" "/opt/airflow/scripts/ci/in_container/run_flake8.sh" \
+ | tee -a "${OUTPUT_LOG}"
else
docker run "${AIRFLOW_CONTAINER_EXTRA_DOCKER_FLAGS[@]}" \
- --entrypoint /opt/airflow/scripts/ci/in_container/run_flake8.sh \
+ --entrypoint "/usr/local/bin/dumb-init" \
--env PYTHONDONTWRITEBYTECODE \
--env AIRFLOW_CI_VERBOSE="${VERBOSE}" \
--env AIRFLOW_CI_SILENT \
--env HOST_USER_ID="$(id -ur)" \
--env HOST_GROUP_ID="$(id -gr)" \
--rm \
"${AIRFLOW_SLIM_CI_IMAGE}" \
- "${FILES[@]}" | tee -a "${OUTPUT_LOG}"
+ "--" "/opt/airflow/scripts/ci/in_container/run_flake8.sh" "${FILES[@]}" \
+ | tee -a "${OUTPUT_LOG}"
fi
}
function run_docs() {
docker run "${AIRFLOW_CONTAINER_EXTRA_DOCKER_FLAGS[@]}" -t \
- --entrypoint /opt/airflow/docs/build.sh \
+ --entrypoint "/usr/local/bin/dumb-init" \
--env PYTHONDONTWRITEBYTECODE \
--env AIRFLOW_CI_VERBOSE="${VERBOSE}" \
--env AIRFLOW_CI_SILENT \
--env HOST_USER_ID="$(id -ur)" \
--env HOST_GROUP_ID="$(id -gr)" \
--rm \
- "${AIRFLOW_SLIM_CI_IMAGE}"
+ "${AIRFLOW_SLIM_CI_IMAGE}" \
+ "--" "/opt/airflow/docs/build.sh" \
+ | tee -a "${OUTPUT_LOG}"
}
function run_check_license() {
docker run "${AIRFLOW_CONTAINER_EXTRA_DOCKER_FLAGS[@]}" -t \
- --entrypoint /opt/airflow/scripts/ci/in_container/run_check_licence.sh \
+ --entrypoint "/usr/bin/dumb-init" \
Review comment:
NOTE: Just a comment - this is CORRECT. dumb-init installed in CheckLicence image uses different installation method and it actually lands in /usr/bin not /usr/local/bin as the dumb-init installed via pip (in CI/CI-slim images).
----------------------------------------------------------------
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