@@ -4,24 +4,14 @@ FROM docker.io/library/golang:1.19-alpine as builder
4
4
5
5
WORKDIR /src
6
6
7
- ARG VERSION
8
- ARG GITCOMMIT
9
- ARG BUILDTIME
10
-
11
7
RUN apk add --no-cache --no-progress \
12
8
ca-certificates \
13
- curl \
14
- git \
15
- openssh \
16
- gcc \
17
- libc-dev
18
-
9
+ curl
10
+
19
11
# Download spruce here to eliminate the need for curl in the final image
20
12
RUN mkdir -p /go/bin && \
21
- arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
22
- curl -L -o /go/bin/spruce https://github.com/geofffranks/spruce/releases/download/v1.30.2/spruce-linux-${arch} && \
23
- chmod +x /go/bin/spruce && \
24
- sha1sum /go/bin/spruce
13
+ curl -L -o /go/bin/spruce https://github.com/geofffranks/spruce/releases/download/v1.29.0/spruce-linux-amd64 && \
14
+ chmod +x /go/bin/spruce
25
15
26
16
COPY . .
27
17
@@ -33,18 +23,17 @@ FROM alpine:latest
33
23
34
24
# Copy over the standard things you'd expect.
35
25
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
36
- COPY --from=builder /src/ caduceus /
37
- COPY --from=builder /src/ .release/docker/entrypoint.sh /
26
+ COPY caduceus /
27
+ COPY .release/docker/entrypoint.sh /
38
28
39
29
# Copy over spruce and the spruce template file used to make the actual configuration file.
40
- COPY --from=builder /src/ .release/docker/caduceus_spruce.yaml /tmp/caduceus_spruce.yaml
41
- COPY --from=builder /go/bin/spruce /bin/
30
+ COPY .release/docker/caduceus_spruce.yaml /tmp/caduceus_spruce.yaml
31
+ COPY --from=builder /go/bin/spruce /bin/
42
32
43
33
# Include compliance details about the container and what it contains.
44
- COPY --from=builder /src/Dockerfile \
45
- /src/NOTICE \
46
- /src/LICENSE \
47
- /src/CHANGELOG.md /
34
+ COPY Dockerfile /
35
+ COPY NOTICE /
36
+ COPY LICENSE /
48
37
49
38
# Make the location for the configuration file that will be used.
50
39
RUN mkdir /etc/caduceus/ \
0 commit comments