소스 검색

Update Dockerfile

Teddysun 5 년 전
부모
커밋
3994f02a29
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      docker/trojan/Dockerfile
  2. 2 2
      docker/trojan/Dockerfile.architecture

+ 2 - 2
docker/trojan/Dockerfile

@@ -7,7 +7,7 @@
 FROM alpine:latest AS builder
 FROM alpine:latest AS builder
 WORKDIR /root
 WORKDIR /root
 RUN set -ex \
 RUN set -ex \
-	&& VERSION="v1.16.0" \
+	&& VERSION="$(wget --no-check-certificate -qO- https://api.github.com/repos/trojan-gfw/trojan/tags | grep 'name' | cut -d\" -f4 | head -1)" \
 	&& apk add --no-cache git build-base make cmake boost-dev openssl-dev mariadb-connector-c-dev \
 	&& apk add --no-cache git build-base make cmake boost-dev openssl-dev mariadb-connector-c-dev \
 	&& git clone --branch ${VERSION} --single-branch https://github.com/trojan-gfw/trojan.git \
 	&& git clone --branch ${VERSION} --single-branch https://github.com/trojan-gfw/trojan.git \
 	&& cd trojan \
 	&& cd trojan \
@@ -25,4 +25,4 @@ COPY --from=builder /root/trojan/trojan /usr/bin
 COPY config.json /etc/trojan/config.json
 COPY config.json /etc/trojan/config.json
 VOLUME /etc/trojan
 VOLUME /etc/trojan
 ENV TZ=Asia/Shanghai
 ENV TZ=Asia/Shanghai
-CMD [ "trojan", "-c", "/etc/trojan/config.json" ]
+CMD [ "/usr/bin/trojan", "-c", "/etc/trojan/config.json" ]

+ 2 - 2
docker/trojan/Dockerfile.architecture

@@ -7,7 +7,7 @@
 FROM --platform=${TARGETPLATFORM} alpine:latest AS builder
 FROM --platform=${TARGETPLATFORM} alpine:latest AS builder
 WORKDIR /root
 WORKDIR /root
 RUN set -ex \
 RUN set -ex \
-	&& VERSION="v1.16.0" \
+	&& VERSION="$(wget --no-check-certificate -qO- https://api.github.com/repos/trojan-gfw/trojan/tags | grep 'name' | cut -d\" -f4 | head -1)" \
 	&& apk add --no-cache git build-base make cmake boost-dev openssl-dev mariadb-connector-c-dev \
 	&& apk add --no-cache git build-base make cmake boost-dev openssl-dev mariadb-connector-c-dev \
 	&& git clone --branch ${VERSION} --single-branch https://github.com/trojan-gfw/trojan.git \
 	&& git clone --branch ${VERSION} --single-branch https://github.com/trojan-gfw/trojan.git \
 	&& cd trojan \
 	&& cd trojan \
@@ -25,4 +25,4 @@ COPY --from=builder /root/trojan/trojan /usr/bin
 COPY config.json /etc/trojan/config.json
 COPY config.json /etc/trojan/config.json
 VOLUME /etc/trojan
 VOLUME /etc/trojan
 ENV TZ=Asia/Shanghai
 ENV TZ=Asia/Shanghai
-CMD [ "trojan", "-c", "/etc/trojan/config.json" ]
+CMD [ "/usr/bin/trojan", "-c", "/etc/trojan/config.json" ]