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.

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

Jump to bottom

Properly carry overlay_vars settings for files in relx #2711

Merged
merged 1 commit into from
May 27, 2022
Merged

Properly carry overlay_vars settings for files in relx #2711

merged 1 commit into from
May 27, 2022

Conversation

ferd
Copy link
Collaborator

@ferd ferd commented May 26, 2022

Without fetching the value otherwise, we ended up with a broken partial config like this:

                [{output_dir,"/tmp/rc_example/_build/dev1/rel"},
                 {overlay_vars_values,[{profile_string,"dev1"}]},
                 {overlay_vars, [{base_dir,"/tmp/rc_example/_build/dev1"}},
                 {overlay,
                     [{template,"conf/sys.config",
                          "releases/{{default_release_version}}/sys.config"},
                      {template,"conf/vm.args",
                          "releases/{{default_release_version}}/vm.args"}]},
                 {dev_mode,true},
                 {extended_start_script,false},
                 {include_erts,false},
                 {overlay_vars,"conf/vars_dev1.config"},
                 {release,{rc_example,"0.1.0"},[rc_example]},
                 {sys_config,"conf/sys.config"},
                 {vm_args,"conf/vm.args"}]

Since the overlay_vars key was there twice, only the first one was consulted and the rest was ignored. The new format instead looks like this:

                [{output_dir,"/tmp/rc_example/_build/dev1/rel"},
                 {overlay_vars_values,[{profile_string,"dev1"}]},
                 {overlay_vars,
                     [{base_dir,"/tmp/rc_example/_build/dev1"},
                      "conf/vars_dev1.config"]},
                 {overlay,
                     [{template,"conf/sys.config",
                          "releases/{{default_release_version}}/sys.config"},
                      {template,"conf/vm.args",
                          "releases/{{default_release_version}}/vm.args"}]},
                 {dev_mode,true},
                 {extended_start_script,false},
                 {include_erts,false},
                 {overlay_vars,"conf/vars_dev1.config"},
                 {release,{rc_example,"0.1.0"},[rc_example]},
                 {sys_config,"conf/sys.config"},
                 {vm_args,"conf/vm.args"}]

Should fix #2710

@ferd ferd requested a review from tsloughter May 26, 2022 20:37
@ferd ferd mentioned this pull request May 26, 2022
Closed
3 tasks
@tsloughter tsloughter merged commit f934571 into erlang:main May 27, 2022
ferd added a commit that referenced this pull request Jun 18, 2022
@ferd
Rebar 3.19.0
cc1b222 
New features:

- [Add --offline option and REBAR_OFFLINE environment variable](#2643)
- [Add support for project-local plugins](#2697)
- [Add eunit --test flag](#2684)

Experimental features for which we promise no backwards compatibility in
the near future:

- [Experimental vendoring provider](#2689)
  - [Support plugins in experimental vendor provider](#2702)

Other changes:

- [Support OTP 23..25 inclusively](#2706)
- [Bump Relx to 4.7.0](#2718)
  - [Use `erlexec` directly in relx helper functions](erlware/relx#902)
  - [Make rlx_util:parse_vsn parse integer versions](erlware/relx#913)
  - [fix awk script check_name() in extended_bin](erlware/relx#915)
  - [avoid crash when overlay is malformed](erlware/relx#916)
  - [keep attributes when stripping beams](erlware/relx#906)
  - [Fix {include_erts,true} in Windows releases](erlware/relx#914)
  - [ensure the erl file is writable before copying dyn_erl to it](erlware/relx#903)
  - Various tests added
- [Properly carry overlay_vars settings for files in relx](#2711)
- [Track mib compilation artifacts](#2709)
- [Attempt to find apps in git subdirs (sparse checkouts)](#2687)
- [Do not discard parameters --system_libs and --include-erts when duplicate values exist](#2695)
- [Use default `depth` parameter for SSL](#2690)
- [Fix global cache config overriding](#2683)
- [Error out on unknown templates in 'new' command](#2676)
- [Fix a typo](#2674)
- [Bump certifi to 2.9.0](#2673)
- [add a debug message in internal dependency fetching code](#2672)
- [Use SPDX id for license in template and test](#2668)
- [Use default branch for git and git_subdir resources with no revision](#2663)

Signed-off-by: Fred Hebert <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tsloughter tsloughter tsloughter approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Can't get template variable substitution to work with profile releases
2 participants
@ferd @tsloughter