From b5eaa5909e723854717ceb814a37641214ac9ffa Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 15:29:36 +0300 Subject: [PATCH 1/7] fix: tmp changes for traefik migrations --- nginx/nginx.conf | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/nginx/nginx.conf b/nginx/nginx.conf index a10de14..bd8d220 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -11,49 +11,9 @@ http { 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 -- 2.36.5 From 0d9c290f8ec775774f4b6f2edee976d9775df290 Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 15:37:52 +0300 Subject: [PATCH 2/7] fix: fix version of dependency because of problems with v16 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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" }, -- 2.36.5 From 9d0f12d48dfd62c801a1b6363291938ab46acb4f Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 15:49:36 +0300 Subject: [PATCH 3/7] chore(version): 0.3.4 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56a068f..00de237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. - - - +## 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 -- 2.36.5 From d108cbb701734d4305a5a8772a8827b35c7a33e2 Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 16:06:22 +0300 Subject: [PATCH 4/7] feat: move nginx config inside container --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7d21e05..b163093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,6 @@ WORKDIR /var/www/ RUN mkdir -p /var/www/website COPY public /var/www/website +COPY nginx/nginx.conf /etc/nginx/nginx.conf + EXPOSE 80 \ No newline at end of file -- 2.36.5 From 6bb357be47fcc38c7617d14b646c5b9c1d0e1322 Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 16:06:31 +0300 Subject: [PATCH 5/7] chore(version): 0.4.0 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00de237..8423bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. - - - +## 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 -- 2.36.5 From 08e99bf8b511346ce5326f8369f464fb072d5186 Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 17:14:42 +0300 Subject: [PATCH 6/7] feat: nginx and docker upgrade - add build stage to docker - fix mime types for nginx --- Dockerfile | 15 +++++++++++++-- nginx/nginx.conf | 6 ++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b163093..47c83ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +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 bd8d220..065a93f 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,16 +1,14 @@ -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 / { root /var/www/website; index index.html; -- 2.36.5 From a0d1596444bfcdd13f1bc076f992a3a37702e49f Mon Sep 17 00:00:00 2001 From: lambda Date: Wed, 8 Jan 2025 18:30:48 +0300 Subject: [PATCH 7/7] chore(version): 0.5.0 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8423bc9..0d6bb00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ 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 -- 2.36.5