Skip to content

Commit

Permalink
Dockerfile: Remove gnupg from Consul k8s container (#1882)
Browse files Browse the repository at this point in the history
* Remove gnupg

* Update CHANGELOG.md
  • Loading branch information
David Yu committed Feb 14, 2023
1 parent 2d2a763 commit b01ebd4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ IMPROVEMENTS:
* Control-Plane
* Add support for the annotation `consul.hashicorp.com/use-proxy-health-check`. When this annotation is used by a service, it configures a readiness endpoint on Consul Dataplane and queries it instead of the proxy's inbound port which forwards requests to the application. [[GH-1824](https://github.com/hashicorp/consul-k8s/pull/1824)], [[GH-1841](https://github.com/hashicorp/consul-k8s/pull/1841)]
* Add health check for synced services based on the status of the Kubernetes readiness probe on synced pod. [[GH-1821](https://github.com/hashicorp/consul-k8s/pull/1821)]
* Remove extraneous `gnupg` depdency from `consul-k8s-control-plane` since it is no longer needed for validating binary artifacts prior to release. [[GH-1882](https://github.com/hashicorp/consul-k8s/pull/1882)]

BUG FIXES:
* Control Plane
Expand Down
4 changes: 2 additions & 2 deletions control-plane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ LABEL name=${BIN_NAME} \
ENV BIN_NAME=${BIN_NAME}
ENV VERSION=${PRODUCT_VERSION}

RUN apk add --no-cache ca-certificates gnupg libcap openssl su-exec iputils libc6-compat iptables
RUN apk add --no-cache ca-certificates libcap openssl su-exec iputils libc6-compat iptables

# TARGETOS and TARGETARCH are set automatically when --platform is provided.
ARG TARGETOS
Expand Down Expand Up @@ -152,7 +152,7 @@ ARG TARGETARCH
# Copy license for Red Hat certification.
COPY LICENSE /licenses/mozilla.txt

RUN microdnf install -y ca-certificates gnupg libcap openssl shadow-utils iptables
RUN microdnf install -y ca-certificates libcap openssl shadow-utils iptables

# Create a non-root user to run the software. On OpenShift, this
# will not matter since the container is run as a random user and group
Expand Down

0 comments on commit b01ebd4

Please sign in to comment.