diff --git a/CHANGELOG.md b/CHANGELOG.md index 56a068f..0d6bb00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,25 @@ All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. - - - +## 0.5.0 - 2025-01-08 +#### Features +- nginx and docker upgrade - (08e99bf) - lambda + +- - - + +## 0.4.0 - 2025-01-08 +#### Features +- move nginx config inside container - (d108cbb) - lambda + +- - - + +## 0.3.4 - 2025-01-08 +#### Bug Fixes +- fix version of dependency because of problems with v16 - (0d9c290) - lambda +- tmp changes for traefik migrations - (b5eaa59) - lambda + +- - - + ## 0.3.3 - 2024-03-16 #### Bug Fixes - fix events data passing into functions - (ef15edf) - lambda diff --git a/Dockerfile b/Dockerfile index 7d21e05..47c83ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,21 @@ # syntax=docker/dockerfile:1 +FROM node:23 as build + +WORKDIR /app + +COPY ./package.json /app/package.json +COPY ./package-lock.json /app/package-lock.json + +RUN npm install +COPY . . +RUN npm run build + FROM nginx:1.22.0-alpine WORKDIR /var/www/ RUN mkdir -p /var/www/website -COPY public /var/www/website +COPY --from=build /app/public /var/www/website +COPY nginx/nginx.conf /etc/nginx/nginx.conf + EXPOSE 80 \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf index a10de14..065a93f 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,59 +1,17 @@ -include /etc/nginx/modules_enabled/*.conf; - events { worker_connections 1024; } http { + include /etc/nginx/mime.types; + server { listen 80; listen [::]:80; - server_name radioiceberg.net www.radioiceberg.net localhost 127.0.0.1; - - location ~ /.well-known/acme-challenge { - allow all; - root /var/www/website; - } - - location / { - rewrite ^ https://$host$request_uri? permanent; - } - } - - server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - include /etc/nginx/mime.types; - server_name radioiceberg.net www.radioiceberg.net localhost 127.0.0.1; - - #SSL - ssl_certificate /etc/letsencrypt/live/radioiceberg.net/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/radioiceberg.net/privkey.pem; - location / { root /var/www/website; index index.html; } - - location /stream { - proxy_read_timeout 3000; - proxy_connect_timeout 3000; - proxy_redirect off; - proxy_pass http://icecast:8000/iceberg.ogg; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $remote_addr; - } - - location /meta { - proxy_pass http://metadata:7000; - proxy_http_version 1.1; - proxy_connect_timeout 1d; - proxy_send_timeout 1d; - proxy_read_timeout 1d; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - } } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d899c39..a2d6ac1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@radioiceberg/message-processor": "^0.0.1" }, "devDependencies": { - "@rollup/plugin-node-resolve": "^15.2.3", + "@rollup/plugin-node-resolve": "15.2.3", "prettier": "^3.2.4", "rollup": "^4.9.5" } diff --git a/package.json b/package.json index dcbd199..c6ce514 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "author": "Radioiceberg team", "license": "GPL-3.0", "devDependencies": { - "@rollup/plugin-node-resolve": "^15.2.3", + "@rollup/plugin-node-resolve": "15.2.3", "prettier": "^3.2.4", "rollup": "^4.9.5" },