Docker: Don't upgrade packages when installing (#24132) (#26055)

Dockerfile

@@ -50,7 +50,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 WORKDIR $GF_PATHS_HOME
 WORKDIR $GF_PATHS_HOME
 
 
 RUN apk add --no-cache ca-certificates bash tzdata && \
 RUN apk add --no-cache ca-certificates bash tzdata && \
-    apk add --no-cache --upgrade openssl musl-utils
+    apk add --no-cache openssl musl-utils
 
 
 COPY conf ./conf
 COPY conf ./conf
 
 

Dockerfile.ubuntu

@@ -50,7 +50,7 @@ WORKDIR $GF_PATHS_HOME
 COPY conf conf
 COPY conf conf
 
 
 # curl should be part of the image
 # curl should be part of the image
-RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl
+RUN apt-get update && apt-get install -y ca-certificates curl
 
 
 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
   addgroup --system --gid $GF_GID grafana && \
   addgroup --system --gid $GF_GID grafana && \

packaging/docker/Dockerfile

@@ -24,11 +24,11 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
 WORKDIR $GF_PATHS_HOME
 WORKDIR $GF_PATHS_HOME
 
 
 RUN apk add --no-cache ca-certificates bash tzdata && \
 RUN apk add --no-cache ca-certificates bash tzdata && \
-    apk add --no-cache --upgrade openssl musl-utils
+    apk add --no-cache openssl musl-utils
 
 
 # Oracle Support for x86_64 only
 # Oracle Support for x86_64 only
 RUN if [ `arch` = "x86_64" ]; then \
 RUN if [ `arch` = "x86_64" ]; then \
-      apk add --no-cache --upgrade libaio libnsl && \
+      apk add --no-cache libaio libnsl && \
       ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
       ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
       wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk \
       wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk \
         -O /tmp/glibc-2.30-r0.apk && \
         -O /tmp/glibc-2.30-r0.apk && \

packaging/docker/ubuntu.Dockerfile

@@ -28,7 +28,7 @@ WORKDIR $GF_PATHS_HOME
 
 
 # Install dependencies
 # Install dependencies
 # We need curl in the image
 # We need curl in the image
-RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl tzdata && \
+RUN apt-get update && apt-get install -y ca-certificates curl tzdata && \
     apt-get autoremove -y && rm -rf /var/lib/apt/lists/*;
     apt-get autoremove -y && rm -rf /var/lib/apt/lists/*;
 
 
 COPY --from=grafana-builder /tmp/grafana "$GF_PATHS_HOME"
 COPY --from=grafana-builder /tmp/grafana "$GF_PATHS_HOME"