airship/vino
Code Issues Proposed changes

Merge "Support proxy certs in vino"

Browse Source
This commit is contained in:
Zuul 2021-04-09 20:50:53 +00:00 committed by Gerrit Code Review
commit a3ec757ab5
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -3,6 +3,14 @@ FROM gcr.io/gcp-runtimes/go1-builder:1.13 as builder
ENV PATH "/usr/local/go/bin:$PATH" ENV PATH "/usr/local/go/bin:$PATH"
# Inject custom root certificate authorities if needed.
# Docker does not have a good conditional copy statement and requires that a
# source file exists to complete the copy function without error. Therefore, the
# README.md file will be copied to the image every time even if there are no
# .crt files.
COPY ./certs/* /usr/local/share/ca-certificates/
RUN update-ca-certificates
WORKDIR /workspace WORKDIR /workspace
# Copy the Go Modules manifests # Copy the Go Modules manifests
COPY go.mod go.mod COPY go.mod go.mod

8
certs/README.md Normal file
View File

@ -0,0 +1,8 @@
# Additional Docker image root certificate authorities
If you require additional certificate authorities for your Docker image:
* Add ASCII PEM encoded .crt files to this directory
* The files will be copied into your docker image at build time.
To update manually copy the `.crt` files to `/usr/local/share/ca-certificates/`
and run `sudo update-ca-certificates`.