瀏覽代碼

Dockerfile fix and more error output at build

crocandr 2 年之前
父節點
當前提交
a449a09bb0
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 2 2
      .github/workflows/main.yml
  2. 3 3
      Dockerfile

+ 2 - 2
.github/workflows/main.yml

@@ -43,7 +43,7 @@ jobs:
           LATEST_URL=$( cat latest_url-*$ARCH*.txt )
           echo "Latest URL: $LATEST_URL"
           [ -z "$LATEST_URL" ] && { echo "Latest url not found"; exit 1; }
-          curl -L -o files/softether.tar.gz "$LATEST_URL"
+          curl -L -o files/softether.tar.gz "$LATEST_URL" || { echo "Softether download error"; exit 1; }
           ls -hal files/softether.tar.gz
           SOFTETHER_VERSION=$( basename $LATEST_URL | sed "s@softether-vpnserver-@@g" | cut -f1-3 -d'-' )
           echo "Softether version: $SOFTETHER_VERSION"
@@ -99,7 +99,7 @@ jobs:
           LATEST_URL=$( cat latest_url-*$ARCH*.txt )
           echo "Latest URL: $LATEST_URL"
           [ -z "$LATEST_URL" ] && { echo "Latest url not found"; exit 1; }
-          curl -L -o files/softether.tar.gz "$LATEST_URL"
+          curl -L -o files/softether.tar.gz "$LATEST_URL" || { echo "Softether download error"; exit 1; }
           ls -hal files/softether.tar.gz
           SOFTETHER_VERSION=$( basename $LATEST_URL | sed "s@softether-vpnserver-@@g" | cut -f1-3 -d'-' )
           echo "Softether version: $SOFTETHER_VERSION"

+ 3 - 3
Dockerfile

@@ -1,9 +1,10 @@
 FROM debian:10
 
-ENV DOWNLOAD_URL https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v4.31-9727-beta/softether-vpnserver-v4.31-9727-beta-2019.11.18-linux-x64-64bit.tar.gz
-
 RUN apt-get update && \
     apt-get install -y curl tar gzip grep make gcc cpp
+
+COPY files/* /opt/
+
 RUN tar xzfp /opt/softether.tar.gz -C /opt && \
     rm -f /opt/softether.tar.gz
 RUN cd /opt/vpnserver && \
@@ -12,7 +13,6 @@ RUN cd /opt/vpnserver && \
     #make i_read_and_agree_the_license_agreement
     make
 
-COPY files/* /opt/
 RUN chmod 755 /opt/*.sh
 
 #ENTRYPOINT /bin/bash