Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NAS-129579 / 24.10-RC.1 / Add custom app form (by RehanY147) #10630

Merged
merged 3 commits into from
Sep 9, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Sep 6, 2024

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x 5ad5564de6e370764519ede83b943b38e4ff5730
git cherry-pick -x e5d45909e5e28ffc3f42d8ec2d23ac12a287e175
git cherry-pick -x dd1a26b4b6b26ef44c5aeecbc1dc40d472a41d5a
git cherry-pick -x 11723bd172ee15cc12f52c0ee5c05b3cbd43eaa4
git cherry-pick -x 9851f195594d964367f2552b53bf327a80bfe241
git cherry-pick -x a1c82363dbf6cc101ab0e7e6db798525723447c0
git cherry-pick -x f4ae8c488aa08a8ee6bd113af9c782d557888392
git cherry-pick -x 8e98c200bc52d9f1bde46e57735b39680499b54e
git cherry-pick -x 4a433bfde5dde11e04ab5587670d0a44f8a67bbc
git cherry-pick -x 98fdf883b89571e50c557ff2fe98364f10996dcc
git cherry-pick -x 86ae8bd398874fc791b58540ae4b18246c774408
git cherry-pick -x 4de3d9c47bd6355552ddd1f4e40622c3a85eaf57
git cherry-pick -x df24a891235de023e0c670c060e81de55dcd91de
git cherry-pick -x 4c720544be5d71187a001985f2b8dc4cada379b3

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x f58a257e79cdf5e634f640ae25de84c3884a91ee

Changes:

Adds a form to install apps using custom YML config

Testing:

Go to the apps discover page, and click on the 'Custom App' button. Enter a unique app name and enter this config in the "Custom Config" input.

services:
  nginx:
    image: nginx:latest
    ports:
      - "8580:80"
    restart: unless-stopped

Downstream

Affects Reasoning
Documentation Adds a form to install custom app with YAML config

Original PR: #10586
Jira URL: https://ixsystems.atlassian.net/browse/NAS-129579

Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported

@undsoft undsoft marked this pull request as ready for review September 9, 2024 11:26
@undsoft undsoft requested a review from a team as a code owner September 9, 2024 11:26
@undsoft undsoft requested review from denysbutenko and removed request for a team September 9, 2024 11:26
@undsoft undsoft enabled auto-merge (squash) September 9, 2024 11:26
Copy link
Contributor

@AlexKarpov98 AlexKarpov98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ported.

@undsoft undsoft merged commit 1a34f87 into stable/electriceel Sep 9, 2024
7 checks passed
@undsoft undsoft deleted the NAS-129579-24.10-RC.1 branch September 9, 2024 12:42
@bugclerk
Copy link
Contributor Author

bugclerk commented Sep 9, 2024

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Sep 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants