From c696028c6794874cdbe787369b11808aae05591e Mon Sep 17 00:00:00 2001
From: mpicci200_comcast <piccione99@yahoo.com>
Date: Wed, 22 Jan 2025 17:43:26 -0500
Subject: [PATCH 1/2] remove changelog from dockerfile

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d472733..99ad814 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,8 +43,7 @@ COPY --from=builder /go/bin/spruce                          /bin/
 # Include compliance details about the container and what it contains.
 COPY --from=builder /src/Dockerfile \
                     /src/NOTICE \
-                    /src/LICENSE \
-                    /src/CHANGELOG.md   /
+                    /src/LICENSE  /
 
 # Make the location for the configuration file that will be used.
 RUN     mkdir /etc/themis/ \

From 14747389120e18be564e356017324a92c888372e Mon Sep 17 00:00:00 2001
From: mpicci200_comcast <piccione99@yahoo.com>
Date: Wed, 22 Jan 2025 17:47:01 -0500
Subject: [PATCH 2/2] do the same thing as tr1d1um

---
 Dockerfile | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99ad814..5e8bde1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,12 @@
-# SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC
-# SPDX-License-Identifier: Apache-2.0
-FROM docker.io/library/golang:1.23-alpine as builder
+## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC
+## SPDX-License-Identifier: Apache-2.0
+FROM docker.io/library/golang:1.19-alpine as builder
 
 WORKDIR /src
 
-ARG VERSION
-ARG GITCOMMIT
-ARG BUILDTIME
-
 RUN apk add --no-cache --no-progress \
     ca-certificates \
-    make \
-    curl \
-    git \
-    openssh \
-    gcc \
-    libc-dev \
-    upx
+    curl
 
 # Download spruce here to eliminate the need for curl in the final image
 RUN mkdir -p /go/bin && \
@@ -33,17 +23,17 @@ FROM alpine:latest
 
 # Copy over the standard things you'd expect.
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt  /etc/ssl/certs/
-COPY --from=builder /src/themis                         /
-COPY --from=builder /src/.release/docker/entrypoint.sh  /
+COPY themis /
+COPY .release/docker/entrypoint.sh  /
 
 # Copy over spruce and the spruce template file used to make the actual configuration file.
-COPY --from=builder /src/.release/docker/themis_spruce.yaml /tmp/themis_spruce.yaml
-COPY --from=builder /go/bin/spruce                          /bin/
+COPY .release/docker/themis_spruce.yaml  /tmp/themis_spruce.yaml
+COPY --from=builder /go/bin/spruce        /bin/
 
 # Include compliance details about the container and what it contains.
-COPY --from=builder /src/Dockerfile \
-                    /src/NOTICE \
-                    /src/LICENSE  /
+COPY Dockerfile /
+COPY NOTICE     /
+COPY LICENSE    /
 
 # Make the location for the configuration file that will be used.
 RUN     mkdir /etc/themis/ \