rafatjah commited on
Commit
2159783
·
1 Parent(s): 17b58a7

Caddy test1

Browse files
Files changed (5) hide show
  1. Caddyfile +4 -0
  2. Dockerfile +16 -37
  3. README.md +1 -1
  4. entrypoint.sh +0 -5
  5. nginx.conf +0 -12
Caddyfile ADDED
@@ -0,0 +1,4 @@
 
 
 
 
 
1
+ :8000 {
2
+ root * /usr/share/caddy
3
+ file_server browse
4
+ }
Dockerfile CHANGED
@@ -1,48 +1,27 @@
1
- FROM nginx:alpine
2
 
3
- RUN apk update && apk add git
4
-
5
-
6
- USER root
7
 
8
- # Create the necessary cache directories and set permissions
9
- RUN mkdir -p /var/cache/nginx \
10
- /var/log/nginx \
11
- /var/lib/nginx \
12
- /var/cache/nginx/client_temp \
13
- /var/cache/nginx/proxy_temp \
14
- /var/cache/nginx/fastcgi_temp \
15
- /var/cache/nginx/uwsgi_temp \
16
- /var/cache/nginx/scgi_temp \
17
- /var/run/nginx
18
-
19
-
20
- RUN chown -R nginx:nginx /var/cache/nginx \
21
- /var/log/nginx \
22
- /var/lib/nginx \
23
- /var/run/nginx
24
 
25
- # Install dependencies and build app as non-root
26
- ENV HOME=/home/nginx \
27
- PATH=/home/nginx/.local/bin:$PATH
28
 
29
 
30
- RUN mkdir -p $HOME/app
31
- RUN chown -R nginx:nginx $HOME/app
32
- # RUN sed -i 's/listen .*/listen 8081;/g' /etc/nginx/conf.d/default.conf
 
33
 
34
- WORKDIR $HOME/app
35
 
36
- RUN git clone https://github.com/openspeedtest/Speed-Test.git
 
37
 
38
- COPY --chown=nginx ./nginx.conf /etc/nginx/conf.d/default.conf
39
- # /etc/nginx/sites-available/default
40
- # COPY --chown=nginx . .
 
41
 
 
 
42
 
43
- RUN touch /var/run/nginx.pid
44
- RUN chown -R nginx:nginx /var/run/nginx.pid
45
 
46
- EXPOSE 8000
47
- USER nginx
48
- ENTRYPOINT ["nginx", "-g", "daemon off;"]
 
1
+ FROM caddy:latest
2
 
 
 
 
 
3
 
4
+ RUN apk update && apk add git
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
5
 
 
 
 
6
 
7
 
8
+ # USER root
9
+ # RUN mkdir -p /usr/share/caddy
10
+ RUN rm /usr/share/caddy/*
11
+ RUN git clone https://github.com/openspeedtest/Speed-Test.git /usr/share/caddy
12
 
13
+ RUN addgroup -S caddy && adduser -S caddy -G caddy
14
 
15
+ RUN chown -R caddy:caddy /config /data/caddy
16
+ USER caddy
17
 
18
+ # WORKDIR /app
19
+ RUN echo $HOME
20
+ COPY ./Caddyfile /etc/caddy/Caddyfile
21
+ # RUN chown -R caddy:caddy /app
22
 
23
+ EXPOSE 2019
24
+ # USER caddy
25
 
 
 
26
 
27
+ # CMD ["caddy" "run" "--config" "/app/caddy.json" "--adapter" "caddyfile"]
 
 
README.md CHANGED
@@ -5,5 +5,5 @@ colorFrom: yellow
5
  colorTo: purple
6
  sdk: docker
7
  pinned: false
8
- app_port: 8000
9
  ---
 
5
  colorTo: purple
6
  sdk: docker
7
  pinned: false
8
+ app_port: 2019
9
  ---
entrypoint.sh DELETED
@@ -1,5 +0,0 @@
1
- # cd /usr/share/nginx/html/
2
- # rm *
3
- # git clone https://github.com/openspeedtest/Speed-Test.git .
4
-
5
- nginx -g 'daemon off;'
 
 
 
 
 
 
nginx.conf DELETED
@@ -1,12 +0,0 @@
1
- server {
2
- listen 8000 default_server;
3
- listen [::]:8000 default_server;
4
-
5
- server_name _;
6
-
7
- location / {
8
- root /home/nginx/Speed-Test;
9
- index index.html index.htm;
10
- }
11
-
12
- }