Skip to content

Fixes broken asset compilation in Docker images#14995

Merged
kaxil merged 1 commit into
apache:masterfrom
potiuk:fix-removed-asset-recompilation
Mar 25, 2021
Merged

Fixes broken asset compilation in Docker images#14995
kaxil merged 1 commit into
apache:masterfrom
potiuk:fix-removed-asset-recompilation

Conversation

@potiuk

@potiuk potiuk commented Mar 25, 2021

Copy link
Copy Markdown
Member

The change #14911 had a bug - when PYTHON_MINOR_MAJOR_VERSION
was removed from the imge args, the replacement python -m site
expression missed /airflow/ suffix. Unfortunately it was not
flagged as an error because the recompiling script silently
skipped recompilation step in such case.

This change:

  • fixes the error
  • removes the silent-skipping if check (the recompilation will
    fail in case it is wrongly set)
  • adds check at image verification whether dist/manifest.json is
    present.

Fixes: #14991


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@potiuk potiuk requested a review from ashb as a code owner March 25, 2021 00:18
@potiuk potiuk requested a review from kaxil March 25, 2021 00:18
@potiuk potiuk added this to the Airflow 2.0.2 milestone Mar 25, 2021
@potiuk potiuk requested a review from mik-laj March 25, 2021 00:18
@potiuk

potiuk commented Mar 25, 2021

Copy link
Copy Markdown
Member Author

This one will need to be cherry-picked to 2.0.2 as well @kaxil

@github-actions github-actions Bot added the full tests needed We need to run full set of tests for this PR to merge label Mar 25, 2021
@github-actions

Copy link
Copy Markdown
Contributor

The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.

@kaxil

kaxil commented Mar 25, 2021

Copy link
Copy Markdown
Member

:( test is failing, this is the same error as #14968 (comment)

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.

@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. Building image for the PR has been cancelled

@potiuk potiuk force-pushed the fix-removed-asset-recompilation branch 2 times, most recently from c1ce886 to 4ab0abd Compare March 25, 2021 03:07
@github-actions

Copy link
Copy Markdown
Contributor

The Workflow run is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason.

The change apache#14911 had a bug - when PYTHON_MINOR_MAJOR_VERSION
was removed from the imge args, the replacement `python -m site`
expression missed `/airflow/` suffix. Unfortunately it was not
flagged as an error because the recompiling script silently
skipped recompilation step in such case.

This change:

* fixes the error
* removes the silent-skipping if check (the recompilation will
  fail in case it is wrongly set)
* adds check at image verification whether dist/manifest.json is
  present.

Fixes: apache#14991
@potiuk potiuk force-pushed the fix-removed-asset-recompilation branch from 4ab0abd to 0fcf08d Compare March 25, 2021 10:58
@kaxil kaxil merged commit 5dc634b into apache:master Mar 25, 2021
potiuk added a commit that referenced this pull request Mar 25, 2021
The change #14911 had a bug - when PYTHON_MINOR_MAJOR_VERSION
was removed from the imge args, the replacement `python -m site`
expression missed `/airflow/` suffix. Unfortunately it was not
flagged as an error because the recompiling script silently
skipped recompilation step in such case.

This change:

* fixes the error
* removes the silent-skipping if check (the recompilation will
  fail in case it is wrongly set)
* adds check at image verification whether dist/manifest.json is
  present.

Fixes: #14991
@potiuk potiuk deleted the fix-removed-asset-recompilation branch April 3, 2021 20:09
ashb pushed a commit that referenced this pull request Apr 15, 2021
The change #14911 had a bug - when PYTHON_MINOR_MAJOR_VERSION
was removed from the imge args, the replacement `python -m site`
expression missed `/airflow/` suffix. Unfortunately it was not
flagged as an error because the recompiling script silently
skipped recompilation step in such case.

This change:

* fixes the error
* removes the silent-skipping if check (the recompilation will
  fail in case it is wrongly set)
* adds check at image verification whether dist/manifest.json is
  present.

Fixes: #14991
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:dev-tools full tests needed We need to run full set of tests for this PR to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Static file not being loaded in web server in docker-compose

2 participants