diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fde4239..459f85e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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💾 diff --git a/Dockerfile b/Dockerfile index 63a179a..6dc62b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/README.md b/README.md index 3a6684c..cb0df19 100644 --- a/README.md +++ b/README.md @@ -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:
-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
or
-docker run -d --rm -p 127.0.0.1:8080:35400/tcp ammnt/freenginx:main +docker run -d --rm -p 127.0.0.1:8080:8080/tcp ammnt/freenginx:main # Description: diff --git a/default.conf b/default.conf new file mode 100644 index 0000000..676a06a --- /dev/null +++ b/default.conf @@ -0,0 +1,10 @@ +server { + listen 8080; + listen [::]:8080; + server_name localhost; + + location / { + root /usr/share/freenginx/html; + index index.html index.htm; + } +} \ No newline at end of file diff --git a/freenginx.conf b/freenginx.conf index 612628c..04c4760 100644 --- a/freenginx.conf +++ b/freenginx.conf @@ -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; } \ No newline at end of file