Skip to content

Commit d293be1

Browse files
Fix security issue in Dockerfile found by SQ (#63)
Signed-off-by: Mu Chen <[email protected]>
1 parent bee0226 commit d293be1

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

.jenkinsfile.blaze-semantic.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def buildInfo = bzSemantic(
1616
native: [
1717
kind: "go",
1818
build: [
19-
platforms: ["linux/arm64", "linux/s390x"]
19+
platforms: ["linux/amd64", "linux/s390x"]
2020
]
2121
]
2222
)

Dockerfile

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04 AS pem
1+
FROM ubuntu:jammy AS pem
22
RUN apt update && apt install curl -y
33
WORKDIR /root/
44
# The links of the IBM root CA and intermediate certs are from https://daymvs1.pok.ibm.com/ibmca/certificates.do;
@@ -9,13 +9,22 @@ RUN curl https://daymvs1.pok.ibm.com/ibmca/downloadCarootCert.do?file=carootcert
99
openssl x509 -inform der -in caintermediatecert.der -out 02-caintermediatecert.pem
1010

1111

12-
FROM busybox:latest
13-
COPY spectrum-virtualize-exporter /bin/spectrum-virtualize-exporter
14-
COPY spectrumVirtualize.yml /etc/spectrumVirtualize/spectrumVirtualize.yml
12+
FROM ubuntu:jammy
13+
14+
ARG APP_USER=spectrum
15+
16+
# Use "make binary" to build the binary spectrum-virtualize-exporter
17+
COPY spectrum-virtualize-exporter /opt/spectrumVirtualize/spectrum-virtualize-exporter
18+
COPY spectrumVirtualize.yml /opt/spectrumVirtualize/spectrumVirtualize.yml
1519
COPY --from=pem /root/*.pem /usr/local/share/ca-certificates/
1620
# https://github.com/golang/go/blob/master/src/crypto/x509/root_linux.go
17-
RUN mkdir -p /etc/ssl/certs && \
18-
cat /usr/local/share/ca-certificates/*.pem >> /etc/ssl/certs/ca-certificates.crt
21+
RUN mkdir -p /etc/ssl/certs \
22+
&& cat /usr/local/share/ca-certificates/*.pem >> /etc/ssl/certs/ca-certificates.crt \
23+
&& groupadd -g 1000 -r $APP_USER \
24+
&& useradd -u 1000 -r -g $APP_USER -d /home/$APP_USER -m -s /bin/bash $APP_USER \
25+
&& chown -R 1000:1000 /opt/spectrumVirtualize
26+
27+
USER $APP_USER
1928
EXPOSE 9119
20-
ENTRYPOINT ["/bin/spectrum-virtualize-exporter"]
29+
ENTRYPOINT ["/opt/spectrumVirtualize/spectrum-virtualize-exporter"]
2130
CMD ["--config.file=/etc/spectrumVirtualize/spectrumVirtualize.yml"]

0 commit comments

Comments
 (0)