Skip to content

Commit

Permalink
Backport of build.Dockerfile: Install ca-certificates into v1.11 (#…
Browse files Browse the repository at this point in the history
…36490)

* make build Dockerfile visible & following naming convention

* install ca-certificates in build.Dockerfile

* re-link changelog entry

* add missing copyright headers

---------

Co-authored-by: Radek Simko <radek.simko@gmail.com>
  • Loading branch information
github-actions[bot] and radeksimko authored Feb 19, 2025
1 parent 7873f91 commit 1f2b2f7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ kind: ENHANCEMENTS
body: Include `ca-certificates` package in our official Docker image to help with certificate handling by downstream
time: 2025-02-11T16:59:22.000+00:00
custom:
Issue: "36471"
Issue: "36486"
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
bin_name: terraform
target: default
arch: ${{matrix.arch}}
dockerfile: .github/workflows/build-Dockerfile
dockerfile: build.Dockerfile
smoke_test: .github/scripts/verify_docker v${{ env.version }}
tags: |
docker.io/hashicorp/${{env.repo}}:${{env.version}}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/build-Dockerfile → build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1

# This Dockerfile is not intended for general use, but is rather used to
# produce our "light" release packages as part of our official release
# pipeline.
Expand Down Expand Up @@ -41,7 +44,7 @@ LABEL org.opencontainers.image.title=${BIN_NAME} \
org.opencontainers.image.vendor="HashiCorp" \
org.opencontainers.image.licenses="BUSL-1.1"

RUN apk add --no-cache git openssh
RUN apk add --no-cache git openssh ca-certificates

# Copy the license file as per Legal requirement
COPY LICENSE "/usr/share/doc/${BIN_NAME}/LICENSE.txt"
Expand Down

0 comments on commit 1f2b2f7

Please # to comment.