gallyg commited on
Commit
ba3d24c
·
verified ·
1 Parent(s): 163e46d

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +14 -12
Dockerfile CHANGED
@@ -1,23 +1,25 @@
1
  FROM calciumion/new-api:latest
2
 
3
- RUN apk add --no-cache pcre2
4
 
5
- COPY --from=nginx:alpine /etc/nginx /etc/nginx
6
- COPY --from=nginx:alpine /usr/sbin/nginx /usr/sbin/nginx
 
 
7
 
 
8
  COPY nginx.conf /etc/nginx/nginx.conf
9
 
10
- RUN mkdir -p /var/log/nginx && \
11
- mkdir -p /var/cache/nginx && \
12
- mkdir -p /var/run && \
13
- chmod -R 777 /var/log/nginx && \
14
- chmod -R 777 /var/cache/nginx && \
15
- chmod -R 777 /var/run
16
 
17
  WORKDIR /data
18
 
19
- EXPOSE 3001
20
 
21
- RUN chmod 777 -R /data
 
 
22
 
23
- ENTRYPOINT ["sh", "-c", "nginx & /one-api"]
 
1
  FROM calciumion/new-api:latest
2
 
3
+ USER root
4
 
5
+ # 安装 nginx + pcre2(Debian/Ubuntu 系列用 apt-get,不是 apk)
6
+ RUN apt-get update \
7
+ && apt-get install -y --no-install-recommends nginx libpcre2-8-0 ca-certificates \
8
+ && rm -rf /var/lib/apt/lists/*
9
 
10
+ # 替换 nginx 配置
11
  COPY nginx.conf /etc/nginx/nginx.conf
12
 
13
+ # 按你原来思路准备目录权限
14
+ RUN mkdir -p /var/log/nginx /var/cache/nginx /var/run /data \
15
+ && chmod -R 777 /var/log/nginx /var/cache/nginx /var/run /data
 
 
 
16
 
17
  WORKDIR /data
18
 
19
+ EXPOSE 7860
20
 
21
+ # 你仓库里是用 start.sh 启动(nginx & /one-api)
22
+ COPY start.sh /start.sh
23
+ RUN chmod +x /start.sh
24
 
25
+ CMD ["/start.sh"]