From 8b4c6276ec6b553b3f64d7c71c6c1b300030130c Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Fri, 17 May 2024 13:24:15 +0000
Subject: [PATCH] Make docker files more similar
See merge request danet/quant!127
---
akms-simulator/Dockerfile | 1 +
etsi14module/Dockerfile | 6 ++++++
goKMS/Dockerfile | 5 +----
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/akms-simulator/Dockerfile b/akms-simulator/Dockerfile
index 4b86cbc4..ac63780c 100644
--- a/akms-simulator/Dockerfile
+++ b/akms-simulator/Dockerfile
@@ -3,6 +3,7 @@ ARG BUILDARGS
ARG GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder
+RUN apt-get update && apt-get upgrade -y
WORKDIR /app/
COPY . .
diff --git a/etsi14module/Dockerfile b/etsi14module/Dockerfile
index 486e545e..d96da9fd 100644
--- a/etsi14module/Dockerfile
+++ b/etsi14module/Dockerfile
@@ -4,6 +4,8 @@ ARG GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder
+RUN apt-get update && apt-get upgrade -y
+
WORKDIR /app/
COPY . .
RUN --mount=type=cache,target=/root/go/pkg/mod \
@@ -11,6 +13,10 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
make build-etsi14module
FROM ${GITLAB_PROXY}debian:bookworm-slim
+RUN apt-get update && apt-get upgrade -y
+
WORKDIR /app/
COPY --from=builder /app/artifacts/etsi14module ./etsi14module
+
+EXPOSE 1414
ENTRYPOINT ["./etsi14module"]
diff --git a/goKMS/Dockerfile b/goKMS/Dockerfile
index e1a1ec65..b35bc60a 100644
--- a/goKMS/Dockerfile
+++ b/goKMS/Dockerfile
@@ -15,11 +15,8 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
FROM ${GITLAB_PROXY}debian:12-slim as debian
RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y iproute2
-RUN apt-get install -y iputils-ping
-RUN apt-get install -y openssh-client openssh-server
-RUN apt-get install -y libssl-dev
COPY --from=builder app/artifacts/goKMS /usr/bin/goKMS
+
EXPOSE 7030
EXPOSE 50900
ENTRYPOINT ["/usr/bin/goKMS"]
--
GitLab