Merge pull request #4245 from emissary-ingress/flynn/dev/glibc-2.34

Pin to glibc 2.34, and fix make deploy on MacOS
emissary-ingress · May 23, 2022 · a94cadb · a94cadb
2 parents fb4cb7b + 230d2ee
commit a94cadb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build-aux/main.mk b/build-aux/main.mk
@@ -150,7 +150,7 @@ boguschart_dir = build-output/chart-2.0.0-bogus_7.0.0-bogus.d
 boguschart_tgz = $(patsubst %.d,%.tgz,$(boguschart_dir))
 
 # YAML manifests
-build-output/yaml-%: $(shell find $(CURDIR)/manifests/emissary/ -type d -o -name '*.yaml.in') $(var.)DEV_REGISTRY $(var.)RELEASE_REGISTRY
+build-output/yaml-%: $(shell find $(CURDIR)/manifests/emissary -type d -o -name '*.yaml.in') $(var.)DEV_REGISTRY $(var.)RELEASE_REGISTRY
 ifeq ($(CI),)
 	rm -rf $@
 else

diff --git a/docker/base-python/Dockerfile b/docker/base-python/Dockerfile
@@ -18,7 +18,7 @@
 # Third-party code
 ########################################
 
-FROM docker.io/frolvlad/alpine-glibc:alpine-3.15
+FROM docker.io/frolvlad/alpine-glibc:alpine-3.15_glibc-2.34
 
 WORKDIR /buildroot