Skip to content

Commit

Permalink
Merge pull request #282 from xmidt-org/docker
Browse files Browse the repository at this point in the history
remove changelog from dockerfile
  • Loading branch information
piccione99 authored Jan 22, 2025
2 parents 7a49c6a + 1474738 commit e7b9606
Showing 1 changed file with 11 additions and 22 deletions.
33 changes: 11 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand All @@ -33,18 +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 \
/src/CHANGELOG.md /
COPY Dockerfile /
COPY NOTICE /
COPY LICENSE /

# Make the location for the configuration file that will be used.
RUN mkdir /etc/themis/ \
Expand Down

0 comments on commit e7b9606

Please sign in to comment.