这是indexloc提供的服务，不要输入任何密码
Skip to content

Ensure the code is copied over to the new app on clone or rebase #7942

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 8, 2025
Merged

Ensure the code is copied over to the new app on clone or rebase #7942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c25da
fix: ensure the code is copied over to the new app on clone or rebase
josegonzalez Sep 8, 2025
63892ed
fix: ignore the VHOST file
josegonzalez Sep 8, 2025
6952ecd
fix: ignore the VHOST file
josegonzalez Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions plugins/git/post-app-clone-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ trigger-git-post-app-clone-setup() {
fi

fn-plugin-property-clone "git" "$OLD_APP" "$NEW_APP"

pushd "$DOKKU_ROOT/$OLD_APP/." >/dev/null
find ./* \( -name ".cache" -o -name "cache" -o -name "VHOST" \) -prune -o -print | cpio -pdmu --quiet "$DOKKU_ROOT/$NEW_APP"
popd &>/dev/null || pushd "/tmp" >/dev/null
}

trigger-git-post-app-clone-setup "$@"
4 changes: 4 additions & 0 deletions plugins/git/post-app-rename-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ trigger-git-post-app-rename-setup() {

fn-plugin-property-clone "git" "$OLD_APP" "$NEW_APP"
fn-plugin-property-destroy "git" "$OLD_APP"

pushd "$DOKKU_ROOT/$OLD_APP/." >/dev/null
find ./* \( -name ".cache" -o -name "cache" -o -name "VHOST" \) -prune -o -print | cpio -pdmu --quiet "$DOKKU_ROOT/$NEW_APP"
popd &>/dev/null || pushd "/tmp" >/dev/null
}

trigger-git-post-app-rename-setup "$@"
92 changes: 92 additions & 0 deletions tests/unit/ports.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,21 @@ setup() {
global_setup
[[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
create_app

dokku --force postgres:destroy $TEST_APP 2>/dev/null || true
dokku --force redis:destroy $TEST_APP 2>/dev/null || true
dokku --force postgres:destroy $TEST_APP-other 2>/dev/null || true
dokku --force redis:destroy $TEST_APP-other 2>/dev/null || true
}

teardown() {
destroy_app

dokku --force postgres:destroy $TEST_APP 2>/dev/null || true
dokku --force redis:destroy $TEST_APP 2>/dev/null || true
dokku --force postgres:destroy $TEST_APP-other 2>/dev/null || true
dokku --force redis:destroy $TEST_APP-other 2>/dev/null || true

[[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
global_teardown
}
Expand Down Expand Up @@ -202,3 +213,84 @@ teardown() {
echo "status: $status"
assert_output "https:3000:3000 https:3003:3003 udp:3001:3001"
}

@test "(ports:rename) renamed app persists ports" {
if ! dokku plugin:installed postgres; then
run /bin/bash -c "dokku plugin:install https://github.com/dokku/dokku-postgres.git"
echo "output: $output"
echo "status: $status"
assert_success
fi

if ! dokku plugin:installed redis; then
run /bin/bash -c "dokku plugin:install https://github.com/dokku/dokku-redis.git"
echo "output: $output"
echo "status: $status"
assert_success
fi

run /bin/bash -c "dokku ports:set $TEST_APP http:80:3000"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "dokku config:set $TEST_APP APP_SECRET=REPLACE_WITH_LONG_SECRET_REPLACE_WITH_LONG_SECRET"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "dokku postgres:create $TEST_APP $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "dokku postgres:link $TEST_APP $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "dokku redis:create $TEST_APP $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "dokku redis:link $TEST_APP $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success

dokku git:from-image $TEST_APP docmost/docmost:latest
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "dokku ports:report $TEST_APP --ports-map"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "http:80:3000"

run /bin/bash -c "dokku ports:report $TEST_APP --ports-map-detected"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "http:3000:3000"

run /bin/bash -c "dokku apps:rename $TEST_APP $TEST_APP-other"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Application deployed"

run /bin/bash -c "dokku ports:report $TEST_APP-other --ports-map"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "http:80:3000"

run /bin/bash -c "dokku ports:report $TEST_APP-other --ports-map-detected"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "http:3000:3000"
}
Loading