samlax12 commited on
Commit
995e6e0
·
verified ·
1 Parent(s): ef477bf

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +12 -34
Dockerfile CHANGED
@@ -1,44 +1,22 @@
1
- # # FROM calciumion/new-api:latest
2
- # FROM pengzhile/new-api:latest
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"]
24
- FROM pengzhile/new-api:latest
25
-
26
- RUN apk add --no-cache pcre2
27
 
28
  COPY --from=nginx:alpine /etc/nginx /etc/nginx
29
- COPY --from=nginx:alpine /usr/sbin/nginx /usr/sbin/nginx
 
30
  COPY nginx.conf /etc/nginx/nginx.conf
31
 
32
- RUN mkdir -p /var/log/nginx && \
33
- mkdir -p /var/cache/nginx && \
34
- mkdir -p /var/run && \
35
- chmod -R 777 /var/log/nginx && \
36
- chmod -R 777 /var/cache/nginx && \
37
  chmod -R 777 /var/run
38
 
39
  WORKDIR /data
 
40
  EXPOSE 3001
 
41
  RUN chmod 777 -R /data
42
 
43
- # Modified entrypoint to only run nginx
44
- ENTRYPOINT ["nginx", "-g", "daemon off;"]
 
1
+ FROM calciumion/new-api:latest
2
+ RUN apk add --no-cache pcre2
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
 
4
  COPY --from=nginx:alpine /etc/nginx /etc/nginx
5
+ COPY --from=nginx:alpine /usr/sbin/nginx /usr/sbin/nginx
6
+
7
  COPY nginx.conf /etc/nginx/nginx.conf
8
 
9
+ RUN mkdir -p /var/log/nginx && \
10
+ mkdir -p /var/cache/nginx && \
11
+ mkdir -p /var/run && \
12
+ chmod -R 777 /var/log/nginx && \
13
+ chmod -R 777 /var/cache/nginx && \
14
  chmod -R 777 /var/run
15
 
16
  WORKDIR /data
17
+
18
  EXPOSE 3001
19
+
20
  RUN chmod 777 -R /data
21
 
22
+ ENTRYPOINT ["sh", "-c", "nginx & /one-api"]