From fa5122f05fb4c17436e7e73c4dee04e803f1c49e Mon Sep 17 00:00:00 2001 From: Pedro Pereira Date: Mon, 4 Nov 2024 18:58:15 +0000 Subject: [PATCH] feat: add CmfEntrypoint from base image --- Dockerfile | 17 ++--------------- cmf-dev.gpg.key | 41 ----------------------------------------- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 cmf-dev.gpg.key diff --git a/Dockerfile b/Dockerfile index 0472b765e5593..393dc83b88d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -253,30 +253,17 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 # License COPY --from=dev.criticalmanufacturing.io/criticalmanufacturing/base:ubi9 /licenses /licenses # CmfEntrypoint -# COPY --from=dev.criticalmanufacturing.io/criticalmanufacturing/base:ubi9 /usr/share/CmfEntrypoint /usr/share/CmfEntrypoint - -# COPY ./cmf.pem /etc/ssl/certs/ -COPY ./cmf-dev.gpg.key /opt/public.gpg.key +COPY --from=dev.criticalmanufacturing.io/criticalmanufacturing/base:ubi9 /usr/share/CmfEntrypoint /usr/share/CmfEntrypoint RUN apt-get update \ && apt-get install -y gnupg wget \ - && apt-key add /opt/public.gpg.key \ && wget http://ftp.de.debian.org/debian/pool/main/i/icu/libicu67_67.1-7_amd64.deb \ && dpkg -i libicu67_67.1-7_amd64.deb \ && rm libicu67_67.1-7_amd64.deb \ && wget http://ftp.de.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb \ && dpkg -i libssl1.1_1.1.1w-0+deb11u1_amd64.deb \ && rm libssl1.1_1.1.1w-0+deb11u1_amd64.deb \ - && echo 'deb https://dev.criticalmanufacturing.io/repository/apt-hosted/ debian main' >> /etc/apt/sources.list.d/cmf.list \ - && apt-get update \ - && apt-get install -y cmfentrypoint=11.0.0.* \ - && rm -rf /var/lib/apt/lists/* \ - && rm /etc/apt/sources.list.d/cmf.list - -# Permissions to add custom certificates -# RUN chmod g+rw -R /usr/local/share/ca-certificates/ -# RUN chmod 644 /etc/ssl/certs/cmf.pem && \ -# update-ca-certificates + && rm -rf /var/lib/apt/lists/* WORKDIR $GF_PATHS_HOME diff --git a/cmf-dev.gpg.key b/cmf-dev.gpg.key deleted file mode 100644 index 586680b9c2c17..0000000000000 --- a/cmf-dev.gpg.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -mLA= -=aAh9 ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file