脚本模板和devcontainer.json模板放在templates/repo/devcontainer/下面比较合适

This commit is contained in:
孟宁
2025-10-17 11:09:58 +08:00
repo.diff.parent 7b2b564320
repo.diff.commit 4a63b36667
repo.diff.stats_desc%!(EXTRA int=6, int=8, int=8)

repo.diff.view_file

@@ -73,7 +73,7 @@ RUN chown git:git /var/lib/gitea /etc/gitea
COPY --from=build-env /tmp/local /
COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/services/devcontainer/devcontainer_init.sh /app/gitea/devcontainer_init.sh
# git:git
USER 1000:1000
ENV GITEA_WORK_DIR=/var/lib/gitea

repo.diff.view_file

@@ -22,7 +22,7 @@ import (
docker_module "code.gitea.io/gitea/modules/docker"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/options"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/setting"
gitea_context "code.gitea.io/gitea/services/context"
files_service "code.gitea.io/gitea/services/repository/files"
@@ -110,7 +110,7 @@ func HasDevContainerDockerFile(ctx context.Context, repo *gitea_context.Reposito
}
func CreateDevcontainerConfiguration(repo *repo.Repository, doer *user.User) error {
jsonContent, err := options.AssetFS().ReadFile("devcontainer/default_devcontainer.json")
jsonContent, err := templates.AssetFS().ReadFile("repo/devcontainer/default_devcontainer.json")
if err != nil {
return err
}
@@ -940,16 +940,16 @@ func GetCommandContent(ctx context.Context, userId int64, repo *repo.Repository)
userCommand := onCreateCommand + "\n" + updateCommand + "\n" + postCreateCommand + "\n" + postStartCommand + "\n" + scriptCommand
assetFS := options.AssetFS()
Content_tmpl, err := assetFS.ReadFile("devcontainer/devcontainer_tmpl.sh")
assetFS := templates.AssetFS()
Content_tmpl, err := assetFS.ReadFile("repo/devcontainer/devcontainer_tmpl.sh")
if err != nil {
return "", err
}
Content_start, err := assetFS.ReadFile("devcontainer/devcontainer_start.sh")
Content_start, err := assetFS.ReadFile("repo/devcontainer/devcontainer_start.sh")
if err != nil {
return "", err
}
Content_restart, err := assetFS.ReadFile("devcontainer/devcontainer_restart.sh")
Content_restart, err := assetFS.ReadFile("repo/devcontainer/devcontainer_restart.sh")
if err != nil {
return "", err
}

repo.diff.view_file

@@ -11,7 +11,7 @@ case $OS_ID in
DevStar_*)
eval "value=\"\$$var\"";
$value ;;
esac
esac
done
;;
centos)