Update alpine and remove the code for the temporary solution (#153)

intel · Dec 7, 2023 · 51a971d · 51a971d
1 parent 1beb81f
commit 51a971d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/container/eventlog-server/Dockerfile b/container/eventlog-server/Dockerfile
@@ -1,7 +1,7 @@
 From golang:1.20-alpine3.18 AS builder
 
 RUN apk update \
-    && apk add --no-cache protoc make wget openssl=3.1.4-r1
+    && apk add --no-cache protoc make wget
 
 WORKDIR /usr/bin
 RUN GRPC_HEALTH_PROBE_VERSION=v0.4.22 && \
@@ -12,8 +12,7 @@ WORKDIR /go/src/github.com/eventlog-server
 COPY service/eventlog-server ./
 RUN make all
 
-From alpine:3.18.4
-RUN apk update && apk add --no-cache openssl=3.1.4-r1
+From alpine:3.18.5
 ARG USER=ccnp
 ARG UID=1000
 ARG GID=1000

diff --git a/container/measurement-server/Dockerfile b/container/measurement-server/Dockerfile
@@ -1,7 +1,7 @@
 From golang:1.20-alpine3.18 AS builder
 
 RUN apk update \
-    && apk add --no-cache protoc make wget openssl=3.1.4-r1
+    && apk add --no-cache protoc make wget
 
 WORKDIR /usr/bin
 RUN GRPC_HEALTH_PROBE_VERSION=v0.4.22 && \
@@ -12,8 +12,7 @@ WORKDIR /go/src/github.com/measurement-server
 COPY service/measurement-server ./
 RUN make all
 
-From alpine:3.18.4
-RUN apk update && apk add --no-cache openssl=3.1.4-r1
+From alpine:3.18.5
 ARG USER=ccnp
 ARG UID=1000
 ARG GID=1000

diff --git a/container/quote-server/Dockerfile b/container/quote-server/Dockerfile
@@ -1,7 +1,7 @@
 FROM rust:1.71-alpine3.18 AS quote-server-builder
 
 RUN apk update \
-    && apk add --no-cache make protobuf-dev musl-dev wget openssl=3.1.4-r1
+    && apk add --no-cache make protobuf-dev musl-dev wget
 
 COPY service/quote-server /quote-server
 COPY api /quote-server/api
@@ -15,8 +15,7 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.4.22 && \
 
 # ======================================================================================================================
 
-From alpine:3.18.4
-RUN apk update && apk add --no-cache openssl=3.1.4-r1
+From alpine:3.18.5
 ARG USER=ccnp
 ARG GROUP=ccnp
 ARG UID=1000

diff --git a/device-plugin/ccnp-device-plugin/container/Dockerfile b/device-plugin/ccnp-device-plugin/container/Dockerfile
@@ -8,7 +8,7 @@ COPY . ./
 RUN make
 
 
-From alpine:3.18.4
+From alpine:3.18.5
 
 WORKDIR /bin
 COPY --from=builder /usr/local/go/src/github.com/ccnp-device-plugin/build/ccnp-device-plugin ./