From 8f05d332886eed6da385b77ba754725be57d25b1 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Sat, 25 Jan 2025 17:06:44 +0100 Subject: [PATCH] Update Dockerfile Signed-off-by: Kjeld Schouten --- containers/apps/db-wait-mongodb/Dockerfile | 49 +++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/containers/apps/db-wait-mongodb/Dockerfile b/containers/apps/db-wait-mongodb/Dockerfile index 777929265d8..680ce75fbf1 100644 --- a/containers/apps/db-wait-mongodb/Dockerfile +++ b/containers/apps/db-wait-mongodb/Dockerfile @@ -1,35 +1,44 @@ # hadolint ignore=DL3007 -FROM tccr.io/tccr/alpine:latest@sha256:ec64547ad03f8d44c8d361fb3542df8cfe1012d8d79fe13fbb7ba977f07f6d7c +FROM ubuntu:latest ARG TARGETPLATFORM ARG VERSION USER root -SHELL ["/bin/sh", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3008,DL3015,SC2086,SC2155,DL4001 RUN \ - apk update && \ - apk add --no-cache \ - curl \ - ca-certificates \ - gnupg \ - bash && \ - curl -fsSLo /etc/apk/keys/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg && \ - echo "https://dl-cdn.alpinelinux.org/alpine/v3.16/community" >> /etc/apk/repositories && \ - curl -fsSL https://downloads.mongodb.com/compass/mongosh-1.8.0-linux-x64.tgz -o /tmp/mongosh.tgz && \ - tar -xvzf /tmp/mongosh.tgz -C /tmp && \ - mv /tmp/mongosh*/bin/mongosh /usr/local/bin/ && \ - chmod +x /usr/local/bin/mongosh && \ - apk del gnupg && \ + curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg \ + && \ + echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list \ + && \ + wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - \ + && \ + echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list \ + && \ case "${TARGETPLATFORM}" in \ 'linux/amd64') export ARCH='linux-x64' ;; \ - esac && \ - rm -rf /tmp/* /var/cache/apk/* && \ - chmod -R u=rwX,go=rX /app && \ - printf "umask %d" "${UMASK}" >> /etc/profile && \ - update-ca-certificates + esac \ + && \ + apt-get -qq update \ + && \ + apt-get -qq install -y \ + mongodb-mongosh \ + && apt-get remove -y \ + jq \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && apt-get autoremove -y \ + && apt-get clean \ + && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/ \ + && chmod -R u=rwX,go=rX /app \ + && printf "umask %d" "${UMASK}" >> /etc/bash.bashrc \ + && update-ca-certificates USER apps