Skip to content

Commit

Permalink
removed: #38 server directive from global file
Browse files Browse the repository at this point in the history
  • Loading branch information
ammnt committed Sep 21, 2024
1 parent 83e0a27 commit 40a4c60
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Test the Docker image🧪
run: |
docker run -d --rm -p 127.0.0.1:8080:35400/tcp ghcr.io/ammnt/freenginx:main
docker run -d --rm -p 127.0.0.1:8080:8080/tcp ghcr.io/ammnt/freenginx:main
curl -v http://127.0.0.1:8080 || exit 1
- name: Push the Docker images to registries💾
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ RUN NB_CORES="${BUILD_CORES-$(getconf _NPROCESSORS_CONF)}" \
&& ln -sf /dev/stdout /tmp/access.log && ln -sf /dev/stderr /tmp/error.log

COPY ./freenginx.conf /etc/freenginx/freenginx.conf
COPY ./default.conf /etc/freenginx/conf.d/default.conf

ENTRYPOINT [ "/sbin/tini", "--" ]

EXPOSE 8080/tcp 8443/tcp 8443/udp
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
[![GitHub issues open](https://img.shields.io/github/issues/ammnt/freenginx.svg)](https://github.com/ammnt/freenginx/issues)

The Docker image is ready to use:<br>
<code>docker run -d --rm -p 127.0.0.1:8080:35400/tcp ghcr.io/ammnt/freenginx:main</code><br>
<code>docker run -d --rm -p 127.0.0.1:8080:8080/tcp ghcr.io/ammnt/freenginx:main</code><br>
or<br>
<code>docker run -d --rm -p 127.0.0.1:8080:35400/tcp ammnt/freenginx:main</code>
<code>docker run -d --rm -p 127.0.0.1:8080:8080/tcp ammnt/freenginx:main</code>

# Description:

Expand Down
10 changes: 10 additions & 0 deletions default.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
server {
listen 8080;
listen [::]:8080;
server_name localhost;

location / {
root /usr/share/freenginx/html;
index index.html index.htm;
}
}
9 changes: 0 additions & 9 deletions freenginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,5 @@ http {
gzip on;
fastcgi_temp_path /tmp/fastcgi_temp;

server {
listen 35400;
server_name localhost;

location / {
root html;
index index.html index.htm;
}
}
include /etc/freenginx/conf.d/*.conf;
}

0 comments on commit 40a4c60

Please sign in to comment.