Skip to content

Commit

Permalink
1.26 ci: Update the intermediate image that gets emitted to no longer…
Browse files Browse the repository at this point in the history
… rely… (#273)

* ci: Update the intermediate image that gets emitted to no longer rely on alpine due to glibc issues

* changelog: move

* ci: Update docs in docker file and make it mimic upstream
  • Loading branch information
nfuden committed Oct 2, 2023
1 parent 1d40d7b commit 30f3b42
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 8 deletions.
18 changes: 18 additions & 0 deletions changelog/v1.26.4-patch4/updatebuild-image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
- type: FIX
issueLink: https://github.com/solo-io/solo-projects/issues/5344
resolvesIssue: false
description: >
Migrate from alpine to ubuntu for released version.
Backlogged an issue to move fully to distroless on beta branch.
Can be found here https://github.com/solo-io/solo-projects/issues/5388
Not migrating prior as this may impact some debugging steps.
Forced to migrate per glibc being unable to update.
https://nvd.nist.gov/vuln/detail/CVE-2022-23218
https://nvd.nist.gov/vuln/detail/CVE-2022-23219
https://nvd.nist.gov/vuln/detail/CVE-2021-38604
https://nvd.nist.gov/vuln/detail/CVE-2021-3998
See here for glibc on alpine maintainers
https://gitlab.alpinelinux.org/alpine/tsc/-/issues/43#note_306270
https://github.com/sgerrand/alpine-pkg-glibc/issues/207#issuecomment-1707209887
https://github.com/sgerrand/alpine-pkg-glibc/issues/176
25 changes: 17 additions & 8 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# This file was inspired by envoy Dockerfile:
# https://github.com/envoyproxy/envoy/blob/445a67344ffda0c8828c8e438e463fcaa7878434/ci/Dockerfile-envoy-alpine

FROM frolvlad/alpine-glibc:alpine-3.17_glibc-2.34
# This file was inspired by a combination of the following:
# Istio and platform's mesh derivative approach
# Uses upstream envoy's ubuntu versioning
# Consuemd by edge to buld gateway-proxy and gloo pods
# May be used as is or as a builder intermediate (e.g. for distroless)
# ON_MINOR_UPDATE: Pull from https://github.com/envoyproxy/envoy/blob/4d46da0bba54dfb849d8bf68b600e53d87310a1a/ci/Dockerfile-envoy#L1-L2
FROM ubuntu:focal

ENV loglevel=info

RUN apk upgrade --update-cache \
&& apk add dumb-init ca-certificates \
&& rm -rf /var/cache/apk/*
ENV DEBIAN_FRONTEND=noninteractive

# hadolint ignore=DL3005,DL3008
RUN apt-get update && \
apt-get install --no-install-recommends -y \
ca-certificates \
&& apt-get upgrade -y \
&& apt-get clean \
&& rm -rf /var/log/*log /var/lib/apt/lists/* /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old

RUN mkdir -p /etc/envoy

ADD envoy.stripped /usr/local/bin/envoy

ENTRYPOINT ["/usr/bin/dumb-init", "--", "/usr/local/bin/envoy"]
ENTRYPOINT ["/usr/local/bin/envoy"]
CMD ["-c", "/etc/envoy/envoy.yaml"]

0 comments on commit 30f3b42

Please sign in to comment.