Skip to content

fix(easy-install): various issues#1724

Merged
barredterra merged 7 commits into
frappe:developfrom
barredterra:easy-install
Jul 2, 2026
Merged

fix(easy-install): various issues#1724
barredterra merged 7 commits into
frappe:developfrom
barredterra:easy-install

Conversation

@barredterra

@barredterra barredterra commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

first issue

Resolved through #1701

second issue

Upstream frappe_docker changed the custom image Containerfile to read apps.json via a BuildKit secret. Our script still only passed the old APPS_JSON_BASE64 build arg, so the image was built with Frappe only, and --install-app erpnext failed with No module named 'erpnext'.

I updated the Docker build command to pass:

--secret id=apps_json,src=/absolute/path/to/apps.json

third issue

easy-install.py defaulted --frappe-branch to version-15, while upstream frappe_docker now builds ERPNext from version-16. That produced the Frappe/ERPNext dependency mismatch. The later pull access denied for custom-apps happened because the script swallowed the Docker build failure and continued into deploy.

Changes made:

  • Default --frappe-branch is now version-16.
  • Bumped default python version from 3.11 to 3.14
  • Bumped default node version from 18 to 24
  • Docker image build/push failures now sys.exit(1) instead of continuing.

@greptile-apps

greptile-apps Bot commented Jun 24, 2026

Copy link
Copy Markdown

Confidence Score: 5/5

Changes are targeted bug fixes with no new logic paths; safe to merge.

Each change is a direct fix for a documented, reproducible failure. The BuildKit secret swap correctly mirrors the upstream Containerfile change, the fail-fast sys.exit(1) prevents silent deploy of broken images, and the SITES_RULE generation unblocks HTTPS compose. No regressions identified in the diff.

easy-install.py — specifically the build_image function around apps.json path handling.

Reviews (7): Last reviewed commit: "Merge remote-tracking branch 'upstream/d..." | Re-trigger Greptile

Comment thread easy-install.py Outdated
@barredterra barredterra changed the title fix(easy-install): generate sites rule for HTTPS compose fix(easy-install): various issues Jun 24, 2026
@barredterra
barredterra requested a review from revant June 24, 2026 00:57
@revant

revant commented Jun 25, 2026

Copy link
Copy Markdown
Collaborator

@Rocket-Quack @DanielRadlAMR can you confirm?

Comment thread easy-install.py Outdated
@DanielRadlAMR

Copy link
Copy Markdown

The fix for the third issue looks correct (it matches the approach in #1700, which addresses the same issue).

I left a review for the fix to the second issue. I'd recommend removing APPS_JSON_BASE64 entirely, as keeping it around defeats the purpose of switching to build secrets in the first place.

Regarding the first issue, I'd wait for @Rocket-Quack. His #1701 already tackles the same issue.

@barredterra barredterra self-assigned this Jun 26, 2026
@barredterra
barredterra removed the request for review from revant June 26, 2026 11:23
@Rocket-Quack

Copy link
Copy Markdown
Contributor

Thx @DanielRadlAMR
I think it's good that some progress has been made on this fix but personally I find the implementation a bit too limited.
Especially since there is no provision for handling existing environments like used old SITES Definition.

IMHO #1701 is more suitable in this regard, but if the only way to implement the fix is through this PR then let’s go with it with the request to expand the documentation take legacy instances into account and also allow the old method of site naming.

@barredterra

Copy link
Copy Markdown
Collaborator Author

@Rocket-Quack happy to merge your PR, I'm sure it solves the problem better. I lack context and was just trying to get the CI to pass.

@sonarqubecloud

sonarqubecloud Bot commented Jul 1, 2026

Copy link
Copy Markdown

@barredterra
barredterra merged commit 61aa0ab into frappe:develop Jul 2, 2026
10 checks passed
@barredterra
barredterra deleted the easy-install branch July 2, 2026 01:31
@barredterra barredterra removed their assignment Jul 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants