IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-13 01:22:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Artem Kuchumov 2020-07-28 17:07:23 +02:00 committed by GitHub
parent 34c2f440db
commit 2ba0083784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -50,7 +50,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
WORKDIR $GF_PATHS_HOME
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

2
Dockerfile.ubuntu
View File

@ -50,7 +50,7 @@ WORKDIR $GF_PATHS_HOME
COPY conf conf
# 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" && \
addgroup --system --gid $GF_GID grafana && \

4
packaging/docker/Dockerfile
View File

@ -24,11 +24,11 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
WORKDIR $GF_PATHS_HOME
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
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 && \
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 && \

2
packaging/docker/ubuntu.Dockerfile
View File

@ -28,7 +28,7 @@ WORKDIR $GF_PATHS_HOME
# Install dependencies
# 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/*;
COPY --from=grafana-builder /tmp/grafana "$GF_PATHS_HOME"