diff --git a/cmd/satellite/Dockerfile b/cmd/satellite/Dockerfile index a927bddca..0434c8dac 100644 --- a/cmd/satellite/Dockerfile +++ b/cmd/satellite/Dockerfile @@ -8,9 +8,6 @@ COPY web/marketing/ /app/marketing RUN npm install RUN npm run build -FROM alpine as ca-cert -RUN apk -U add ca-certificates - FROM ${DOCKER_ARCH:-amd64}/alpine ARG TAG ARG GOARCH @@ -21,10 +18,10 @@ ENV CONF_PATH=/root/.local/share/storj/satellite \ EXPOSE 7777 EXPOSE 10100 WORKDIR /app +RUN apk -U add ca-certificates COPY --from=ui /app/static /app/static COPY --from=ui /app/dist /app/dist COPY --from=ui /app/marketing /app/marketing -COPY --from=ca-cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY release/${TAG}/satellite_linux_${GOARCH:-amd64} /app/satellite COPY release/${TAG}/inspector_linux_${GOARCH:-amd64} /app/inspector COPY cmd/satellite/entrypoint /entrypoint diff --git a/cmd/storagenode/Dockerfile b/cmd/storagenode/Dockerfile index 774797a79..f74261771 100644 --- a/cmd/storagenode/Dockerfile +++ b/cmd/storagenode/Dockerfile @@ -5,7 +5,7 @@ ARG GOARCH ENV GOARCH ${GOARCH} EXPOSE 28967 WORKDIR /app -COPY resources/certs.pem /etc/ssl/certs/ca-certificates.crt +RUN apk -U add ca-certificates COPY release/${TAG}/storagenode_linux_${GOARCH:-amd64} /app/storagenode COPY cmd/storagenode/entrypoint /entrypoint COPY cmd/storagenode/dashboard.sh /app/dashboard.sh diff --git a/cmd/uplink/Dockerfile b/cmd/uplink/Dockerfile index f146bb218..f650af056 100644 --- a/cmd/uplink/Dockerfile +++ b/cmd/uplink/Dockerfile @@ -9,6 +9,7 @@ ENV CONF_PATH=/root/.local/storj/uplink \ SATELLITE_ADDR= WORKDIR /app VOLUME /root/.local/storj/uplink +RUN apk -U add ca-certificates COPY release/${TAG}/uplink_linux_${GOARCH:-amd64} /app/uplink COPY cmd/uplink/entrypoint /entrypoint ENTRYPOINT ["/entrypoint"] diff --git a/resources/certs.pem b/resources/certs.pem deleted file mode 100644 index 0002462ce..000000000 --- a/resources/certs.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow -SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT -GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF -q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 -SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 -Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA -a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj -/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T -AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG -CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv -bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k -c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw -VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC -ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz -MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu -Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF -AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo -uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ -wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu -X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG -PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 -KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== ------END CERTIFICATE-----