mirror of
https://github.com/hashicorp/packer.git
synced 2026-03-23 10:56:54 -04:00
Merge branch 'main' into anurag/native_sbom
This commit is contained in:
Anurag Sharma
GitHub
commit
2bbe514b0f
6 changed files with 46 additions and 13 deletions
35
CHANGELOG.md
35
CHANGELOG.md
|
|
@ -1,5 +1,40 @@
|
|||
# 📦 Changelog
|
||||
|
||||
## 1.15.0 (February 4, 2026)
|
||||
|
||||
### IMPROVEMENTS:
|
||||
|
||||
* core/hcp: add support for updating HCP Packer registry channels and bucket log UI metadata.
|
||||
[GH-13532](https://github.com/hashicorp/packer/pull/13532)
|
||||
|
||||
* build: update Go to 1.24.12.
|
||||
[GH-13553](https://github.com/hashicorp/packer/pull/13553)
|
||||
|
||||
* docker: remove vmware and vsphere from the packer full image.
|
||||
[GH-13442](https://github.com/hashicorp/packer/pull/13442)
|
||||
|
||||
* docs: add comments to packer docs.
|
||||
[GH-13534](https://github.com/hashicorp/packer/pull/13534)
|
||||
|
||||
* compliance: update copyright and license headers.
|
||||
[GH-13540](https://github.com/hashicorp/packer/pull/13540)
|
||||
[GH-13543](https://github.com/hashicorp/packer/pull/13543)
|
||||
[GH-13545](https://github.com/hashicorp/packer/pull/13545)
|
||||
[GH-13544](https://github.com/hashicorp/packer/pull/13544)
|
||||
|
||||
### BUG FIXES:
|
||||
|
||||
* datasource/http: update acceptance test URL to avoid rate limiting.
|
||||
[GH-13480](https://github.com/hashicorp/packer/pull/13480)
|
||||
|
||||
* provisioner/powershell: ensure `LASTEXITCODE` is set before checking its value in tests.
|
||||
[GH-13539](https://github.com/hashicorp/packer/pull/13539)
|
||||
|
||||
### SECURITY:
|
||||
|
||||
* Bump golang.org/x/crypto to 0.46.0
|
||||
[GH-13546](https://github.com/hashicorp/packer/pull/13546)
|
||||
|
||||
## 1.14.3 (November 18, 2025)
|
||||
|
||||
### IMPROVEMENTS:
|
||||
|
|
|
|||
|
|
@ -69,9 +69,7 @@ RUN /bin/packer plugins install "github.com/hashicorp/amazon" && \
|
|||
/bin/packer plugins install "github.com/hashicorp/googlecompute" && \
|
||||
/bin/packer plugins install "github.com/hashicorp/qemu" && \
|
||||
/bin/packer plugins install "github.com/hashicorp/vagrant" && \
|
||||
/bin/packer plugins install "github.com/hashicorp/virtualbox" && \
|
||||
/bin/packer plugins install "github.com/hashicorp/vmware" && \
|
||||
/bin/packer plugins install "github.com/hashicorp/vsphere"
|
||||
/bin/packer plugins install "github.com/hashicorp/virtualbox"
|
||||
|
||||
ENTRYPOINT ["/bin/packer"]
|
||||
|
||||
|
|
|
|||
14
LICENSE
14
LICENSE
|
|
@ -3,22 +3,22 @@ License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
|
|||
|
||||
Parameters
|
||||
|
||||
Licensor: HashiCorp, Inc.
|
||||
Licensor: International Business Machines Corporation (IBM)
|
||||
Licensed Work: Packer Version 1.10.0 or later. The Licensed Work is (c) 2024
|
||||
HashiCorp, Inc.
|
||||
IBM Corp.
|
||||
Additional Use Grant: You may make production use of the Licensed Work, provided
|
||||
Your use does not include offering the Licensed Work to third
|
||||
parties on a hosted or embedded basis in order to compete with
|
||||
HashiCorp's paid version(s) of the Licensed Work. For purposes
|
||||
IBM Corp's paid version(s) of the Licensed Work. For purposes
|
||||
of this license:
|
||||
|
||||
A "competitive offering" is a Product that is offered to third
|
||||
parties on a paid basis, including through paid support
|
||||
arrangements, that significantly overlaps with the capabilities
|
||||
of HashiCorp's paid version(s) of the Licensed Work. If Your
|
||||
of IBM Corp's paid version(s) of the Licensed Work. If Your
|
||||
Product is not a competitive offering when You first make it
|
||||
generally available, it will not become a competitive offering
|
||||
later due to HashiCorp releasing a new version of the Licensed
|
||||
later due to IBM Corp releasing a new version of the Licensed
|
||||
Work with additional capabilities. In addition, Products that
|
||||
are not provided on a paid basis are not competitive.
|
||||
|
||||
|
|
@ -34,10 +34,10 @@ Additional Use Grant: You may make production use of the Licensed Work, provided
|
|||
|
||||
Hosting or using the Licensed Work(s) for internal purposes
|
||||
within an organization is not considered a competitive
|
||||
offering. HashiCorp considers your organization to include all
|
||||
offering. IBM Corp considers your organization to include all
|
||||
of your affiliates under common control.
|
||||
|
||||
For binding interpretive guidance on using HashiCorp products
|
||||
For binding interpretive guidance on using IBM Corp products
|
||||
under the Business Source License, please visit our FAQ.
|
||||
(https://www.hashicorp.com/license-faq)
|
||||
Change Date: Four years from the date the Licensed Work is published.
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const wrapPowershellString string = `
|
|||
$exitCode = 1
|
||||
}
|
||||
|
||||
if ($LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0) {
|
||||
if ((Test-Path variable:global:LASTEXITCODE) -and $LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0) {
|
||||
$exitCode = $LASTEXITCODE
|
||||
}
|
||||
exit $exitCode
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ func TestProvisionerPrepare_extractScript(t *testing.T) {
|
|||
|
||||
// File contents should contain 2 lines concatenated by newlines: foo\nbar
|
||||
readFile, err := os.ReadFile(file)
|
||||
expectedContents := "if (Test-Path variable:global:ProgressPreference) {\n set-variable -name variable:global:ProgressPreference -value 'SilentlyContinue'\n }\n \n $exitCode = 0\n try {\n $env:PACKER_BUILDER_TYPE=\"\"; $env:PACKER_BUILD_NAME=\"\"; \n foo\n bar\n \n $exitCode = 0\n } catch {\n Write-Error \"An error occurred: $_\"\n $exitCode = 1\n }\n \n if ($LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0) {\n $exitCode = $LASTEXITCODE\n }\n exit $exitCode"
|
||||
expectedContents := "if (Test-Path variable:global:ProgressPreference) {\n set-variable -name variable:global:ProgressPreference -value 'SilentlyContinue'\n }\n \n $exitCode = 0\n try {\n $env:PACKER_BUILDER_TYPE=\"\"; $env:PACKER_BUILD_NAME=\"\"; \n foo\n bar\n \n $exitCode = 0\n } catch {\n Write-Error \"An error occurred: $_\"\n $exitCode = 1\n }\n \n if ((Test-Path variable:global:LASTEXITCODE) -and $LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0) {\n $exitCode = $LASTEXITCODE\n }\n exit $exitCode"
|
||||
normalizedExpectedContent := normalizeWhiteSpace(expectedContents)
|
||||
if err != nil {
|
||||
t.Fatalf("Should not be error: %s", err)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
1.14.4-dev
|
||||
1.15.1-dev
|
||||
|
|
|
|||
Loading…
Reference in a new issue