orztv commited on
Commit
894eb80
·
1 Parent(s): 2f8135b
Files changed (2) hide show
  1. Dockerfile +2 -2
  2. start.sh +4 -4
Dockerfile CHANGED
@@ -11,8 +11,8 @@ RUN wget -q https://github.com/traefik/traefik/releases/download/v${TRAEFIK_VERS
11
  && mv traefik /usr/local/bin/ \
12
  && rm traefik_v${TRAEFIK_VERSION}_linux_amd64.tar.gz
13
 
14
- # 安装 jq 用于解析 JSON 和 http-server
15
- RUN apt-get update && apt-get install -y jq && \
16
  npm install -g http-server
17
 
18
  # 切换到 pn 用户
 
11
  && mv traefik /usr/local/bin/ \
12
  && rm traefik_v${TRAEFIK_VERSION}_linux_amd64.tar.gz
13
 
14
+ # 安装 jq 用于解析 JSON,http-servergettext-base(包含 envsubst)
15
+ RUN apt-get update && apt-get install -y jq gettext-base curl && \
16
  npm install -g http-server
17
 
18
  # 切换到 pn 用户
start.sh CHANGED
@@ -63,6 +63,10 @@ generate_traefik_config() {
63
  # 生成 Traefik 配置
64
  generate_traefik_config
65
 
 
 
 
 
66
  # 启动服务
67
  echo "$services" | while read -r service; do
68
  name=$(echo $service | jq -r '.name')
@@ -114,9 +118,5 @@ echo "$services" | while read -r service; do
114
  fi
115
  done
116
 
117
- # 替换 Traefik 配置文件中的环境变量
118
- envsubst < $TRAEFIK_CONFIG_FILE > /tmp/traefik.yml
119
- mv /tmp/traefik.yml $TRAEFIK_CONFIG_FILE
120
-
121
  # 启动 Traefik
122
  exec traefik --configFile=$TRAEFIK_CONFIG_FILE
 
63
  # 生成 Traefik 配置
64
  generate_traefik_config
65
 
66
+ # 替换 Traefik 配置文件中的环境变量
67
+ envsubst < /home/pn/app/traefik/dynamic.yml > /tmp/dynamic.yml
68
+ mv /tmp/dynamic.yml /home/pn/app/traefik/dynamic.yml
69
+
70
  # 启动服务
71
  echo "$services" | while read -r service; do
72
  name=$(echo $service | jq -r '.name')
 
118
  fi
119
  done
120
 
 
 
 
 
121
  # 启动 Traefik
122
  exec traefik --configFile=$TRAEFIK_CONFIG_FILE