From 4bb372b77d5a21ab13125a10d13f7eec5c21351c Mon Sep 17 00:00:00 2001 From: raidenii Date: Tue, 23 May 2023 21:41:12 -0400 Subject: [PATCH] rootless (#63) --- Dockerfile | 10 +++++----- v2ray.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94fdad6..b098d54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ FROM --platform=${TARGETPLATFORM} alpine:latest LABEL maintainer="V2Fly Community " -WORKDIR /root +WORKDIR /tmp ARG TARGETPLATFORM ARG TAG -COPY v2ray.sh /root/v2ray.sh +COPY v2ray.sh "${WORKDIR}"/v2ray.sh RUN set -ex \ - && apk add --no-cache tzdata openssl ca-certificates \ + && apk add --no-cache ca-certificates \ && mkdir -p /etc/v2ray /usr/local/share/v2ray /var/log/v2ray \ # forward request and error logs to docker log collector && ln -sf /dev/stdout /var/log/v2ray/access.log \ && ln -sf /dev/stderr /var/log/v2ray/error.log \ - && chmod +x /root/v2ray.sh \ - && /root/v2ray.sh "${TARGETPLATFORM}" "${TAG}" + && chmod +x "${WORKDIR}"/v2ray.sh \ + && "${WORKDIR}"/v2ray.sh "${TARGETPLATFORM}" "${TAG}" ENTRYPOINT ["/usr/bin/v2ray"] diff --git a/v2ray.sh b/v2ray.sh index 3b5e622..7892af0 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -44,8 +44,8 @@ fi echo "Download binary file: ${V2RAY_FILE} ${DGST_FILE} completed" # Check SHA512 -V2RAY_ZIP_HASH=$(openssl dgst -sha512 v2ray.zip | sed 's/([^)]*)//g') -V2RAY_ZIP_DGST_HASH=$(cat v2ray.zip.dgst | grep -e 'SHA512' -e 'SHA2-512' | head -n1) +V2RAY_ZIP_HASH=$(sha512sum v2ray.zip | cut -f1 -d' ') +V2RAY_ZIP_DGST_HASH=$(cat v2ray.zip.dgst | grep -e 'SHA512' -e 'SHA2-512' | head -n1 | cut -f2 -d' ') if [ "${V2RAY_ZIP_HASH}" = "${V2RAY_ZIP_DGST_HASH}" ]; then echo " Check passed" && rm -fv v2ray.zip.dgst