From 5ee3ac02dd64177faf84caad9e929633f96ca489 Mon Sep 17 00:00:00 2001
From: Ricardo Katz <ricardo.katz@gmail.com>
Date: Sat, 27 Jan 2024 10:24:10 -0300
Subject: [PATCH] Final reviews on nginx v1.25 image

---
 images/nginx-1.25/rootfs/Dockerfile | 6 ++----
 images/nginx-1.25/rootfs/build.sh   | 7 ++-----
 rootfs/Dockerfile-chroot            | 2 +-
 test/e2e/wait-for-nginx.sh          | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/images/nginx-1.25/rootfs/Dockerfile b/images/nginx-1.25/rootfs/Dockerfile
index ce38cf8d5..ad0c9d654 100644
--- a/images/nginx-1.25/rootfs/Dockerfile
+++ b/images/nginx-1.25/rootfs/Dockerfile
@@ -32,8 +32,7 @@ COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
 COPY --from=builder /etc/nginx /etc/nginx
 
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ 
-  && apk update \
+RUN apk update \
   && apk upgrade \
   && apk add -U --no-cache \
   bash \
@@ -51,8 +50,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/reposit
   tzdata \
   grpc-cpp \
   libprotobuf \
-  opentelemetry-cpp-exporter-otlp-common \
-  opentelemetry-cpp-exporter-otlp-grpc \
+  && apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing opentelemetry-cpp-exporter-otlp-common opentelemetry-cpp-exporter-otlp-grpc \
   && ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \
   && adduser -S -D -H -u 101 -h /usr/local/nginx \
   -s /sbin/nologin -G www-data -g www-data www-data \
diff --git a/images/nginx-1.25/rootfs/build.sh b/images/nginx-1.25/rootfs/build.sh
index c759ff026..0fded23d6 100755
--- a/images/nginx-1.25/rootfs/build.sh
+++ b/images/nginx-1.25/rootfs/build.sh
@@ -128,9 +128,6 @@ get_src()
   rm -rf "$f"
 }
 
-# Enable testing/edge repo for OTEL
-echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
 # install required packages to build
 # Dependencies from "ninja" and below are OTEL dependencies
 apk add \
@@ -178,9 +175,9 @@ apk add \
   c-ares-dev \
   re2-dev \
   grpc-dev \
-  protobuf-dev \
-  opentelemetry-cpp-dev
+  protobuf-dev 
 
+apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing opentelemetry-cpp-dev
 
 # There is some bug with some platforms and git, so force HTTP/1.1
 git config --global http.version HTTP/1.1
diff --git a/rootfs/Dockerfile-chroot b/rootfs/Dockerfile-chroot
index 494e2baae..b52cbddf9 100644
--- a/rootfs/Dockerfile-chroot
+++ b/rootfs/Dockerfile-chroot
@@ -23,7 +23,7 @@ RUN apk update \
   && apk upgrade \
   && /chroot.sh
 
-FROM alpine:3.19.0 
+FROM alpine:3.19.0
 
 ARG TARGETARCH
 ARG VERSION
diff --git a/test/e2e/wait-for-nginx.sh b/test/e2e/wait-for-nginx.sh
index b6d8b89fc..d2529e348 100755
--- a/test/e2e/wait-for-nginx.sh
+++ b/test/e2e/wait-for-nginx.sh
@@ -24,7 +24,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export NAMESPACE=$1
 export NAMESPACE_OVERLAY=$2
 export IS_CHROOT=$3
-export ENABLE_VALIDATIONS=$4 
+export ENABLE_VALIDATIONS=$4
 
 echo "deploying NGINX Ingress controller in namespace $NAMESPACE"