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

Support configuring Halo in working directory #2935

Merged

Conversation

JohnNiang
Copy link
Member

@JohnNiang JohnNiang commented Dec 13, 2022

What type of PR is this?

/kind improvement
/area core
/milestone 2.1.x

What this PR does / why we need it:

Force to add environment variables HALO_WORK_DIR and SPRING_CONFIG_LOCATION into Dockerfile. After that, we can configure application.yaml in working directory as we want.

Please note that we can not configure Halo working directory in /root/.halo2/application.yaml directly. Use environment variable HALO_WORK_DIR instead.

Which issue(s) this PR fixes:

Fixes #2812

Special notes for your reviewer:

Steps to test:

  1. Prepare custom configuration

    mkdir -p halo2
    
    cat <<EOF > halo2/application.yaml
    server:
      port: 12345
    EOF
  2. Start up Halo using Docker

    docker run -it --rm -p12345:12345 -v `pwd`/halo2:/root/.halo2  johnniang/halo:configure-halo-in-work-dir
  3. Request http://localhost:12345

    curl -v localhost:12345

Does this PR introduce a user-facing change?

支持在工作目录添加自定义配置

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. labels Dec 13, 2022
@f2c-ci-robot f2c-ci-robot bot added this to the 2.1.x milestone Dec 13, 2022
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and lan-yonghui December 13, 2022 08:50
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Dec 13, 2022
@JohnNiang JohnNiang added kind/improvement Categorizes issue or PR as related to a improvement. and removed kind/feature Categorizes issue or PR as related to a new feature. labels Dec 13, 2022
@ruibaby
Copy link
Member

ruibaby commented Dec 13, 2022

这个需要改动文档吗?

@JohnNiang
Copy link
Member Author

这个需要改动文档吗?

可以用文档描述一下这个功能。

Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Dec 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ruibaby

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2022
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2022
@f2c-ci-robot f2c-ci-robot bot merged commit 3033ceb into halo-dev:main Dec 14, 2022
@JohnNiang
Copy link
Member Author

/cherry-pick release-2.0

@halo-dev-bot
Copy link
Collaborator

@JohnNiang: new pull request created: #2950

In response to this:

/cherry-pick release-2.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ruibaby ruibaby modified the milestones: 2.1.x, 2.1.0 Dec 14, 2022
f2c-ci-robot bot pushed a commit that referenced this pull request Dec 14, 2022
This is an automated cherry-pick of #2935

/assign JohnNiang

```release-note
支持在工作目录添加自定义配置
```
@JohnNiang JohnNiang deleted the feat/config-with-application-yaml branch December 19, 2022 05:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

为2.0增加Docker以application.yaml配置的方式启动
4 participants