From 8c90a783b6e35530bc5db2fe5a62528f037f8ae6 Mon Sep 17 00:00:00 2001 From: Samuel Huang Date: Fri, 4 Oct 2024 20:37:19 +1000 Subject: [PATCH] Trivy compliant --- Dockerfile | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17038b4..80cf89b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,21 +9,22 @@ RUN git clone https://github.com/XTLS/Xray-core.git . && \ git checkout ${XRAYVER} && \ go build -o xray -trimpath -ldflags "-s -w -buildid=" ./main -RUN cd /tmp; curl -sSLO https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat -RUN cd /tmp; curl -sSLO https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat +RUN curl -sSLO https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat +RUN curl -sSLO https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat FROM nginx:stable-alpine3.20 ARG ACMEVER='2.9.0' -COPY --from=builder /go/src/XTLS/Xray-core/xray /usr/local/bin/ -COPY --from=builder /tmp/geosite.dat /usr/local/bin/ -COPY --from=builder /tmp/geoip.dat /usr/local/bin/ +COPY --from=builder /go/src/XTLS/Xray-core/xray /usr/local/bin/ +COPY --from=builder /go/src/XTLS/Xray-core/geoip.dat /usr/local/bin/ +COPY --from=builder /go/src/XTLS/Xray-core/geosite.dat /usr/local/bin/ +WORKDIR /root RUN apk add --no-cache bash openssl curl socat jq moreutils libcap-setcap -RUN cd /root; curl -sSL "https://github.com/acmesh-official/acme.sh/archive/refs/tags/${ACMEVER}.tar.gz"|tar zxvf - -RUN cd /root; ln -s acme.sh-${ACMEVER} acme.sh; mkdir .acme.sh +RUN curl -sSL "https://github.com/acmesh-official/acme.sh/archive/refs/tags/${ACMEVER}.tar.gz"|tar zxvf - +RUN ln -s acme.sh-${ACMEVER} acme.sh; mkdir .acme.sh RUN setcap CAP_NET_BIND_SERVICE=+eip /usr/sbin/nginx COPY nginx-site.tpl /etc/nginx/conf.d/ @@ -31,33 +32,32 @@ COPY nginx-stream.tpl /etc/nginx/conf.d/ COPY nginx-proxy.tpl /etc/nginx/conf.d/ COPY nginx-grpc.tpl /etc/nginx/conf.d/ COPY nginx-ws.tpl /etc/nginx/conf.d/ - COPY proxy-log-fmt.tpl /etc/nginx/conf.d/000-proxy-log-fmt.conf -COPY server-lgp.sh /server-lgp.sh -COPY server-lgr.sh /server-lgr.sh -COPY server-lgt.sh /server-lgt.sh +COPY server-lgp.sh /server-lgp.sh +COPY server-lgr.sh /server-lgr.sh +COPY server-lgt.sh /server-lgt.sh -COPY server-lsp.sh /server-lsp.sh -COPY server-lst.sh /server-lst.sh +COPY server-lsp.sh /server-lsp.sh +COPY server-lst.sh /server-lst.sh -COPY server-ltr.sh /server-ltr.sh -COPY server-ltt.sh /server-ltt.sh +COPY server-ltr.sh /server-ltr.sh +COPY server-ltt.sh /server-ltt.sh -COPY server-lwp.sh /server-lwp.sh -COPY server-lwt.sh /server-lwt.sh +COPY server-lwp.sh /server-lwp.sh +COPY server-lwt.sh /server-lwt.sh -COPY server-mtt.sh /server-mtt.sh -COPY server-mwp.sh /server-mwp.sh -COPY server-mwt.sh /server-mwt.sh +COPY server-mtt.sh /server-mtt.sh +COPY server-mwp.sh /server-mwp.sh +COPY server-mwt.sh /server-mwt.sh -COPY server-twp.sh /server-twp.sh -COPY server-ttt.sh /server-ttt.sh -COPY server-twt.sh /server-twt.sh +COPY server-twp.sh /server-twp.sh +COPY server-ttt.sh /server-ttt.sh +COPY server-twt.sh /server-twt.sh -COPY server-nginx.sh /server-nginx.sh +COPY server-nginx.sh /server-nginx.sh -COPY run.sh /run.sh +COPY run.sh /run.sh RUN chmod 755 /*.sh