Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.26 ci: Update the intermediate image that gets emitted to no longer rely… #273

Merged
merged 3 commits into from
Oct 2, 2023
Merged

1.26 ci: Update the intermediate image that gets emitted to no longer rely… #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
721f2b4
ci: Update the intermediate image that gets emitted to no longer rely…
nfuden Sep 28, 2023
4a183dc
changelog: move
nfuden Sep 28, 2023
13b08b4
ci: Update docs in docker file and make it mimic upstream
nfuden Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions changelog/v1.26.4-patch4/updatebuild-image.yaml
View file
Open in desktop
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
View file
Open in desktop
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"]