Merge branch 'main' into refactor-server-tidy

diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 2273a13823ab59f49a6b8bc70dbd5ffbf2d93e3a..ae2d4e51f0a74a9ffb498c83f10a0f8acced7bfc 100644 (file)
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -21,7 +21,7 @@ body:
         - label: Is this only a single bug? Do not put multiple bugs in one issue.
           required: true
         - label: Is this a server side (not related to the UI) issue? Use the [Lemmy back end](https://github.com/LemmyNet/lemmy) repo.
-          required: true
+          required: false
   - type: textarea
     id: summary
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
index 2f6f3fc1f9dae8cc7bc265ade72d3ef93f140605..3c75050ab8a964b03a93030ba90821c505ef5de4 100644 (file)
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -19,7 +19,7 @@ body:
         - label: Is this only a feature request? Do not put multiple feature requests in one issue.
           required: true
         - label: Is this a server side (not related to the UI) issue? Use the [Lemmy back end](https://github.com/LemmyNet/lemmy) repo.
-          required: true
+          required: false
   - type: textarea
     id: problem
     attributes:

diff --git a/Dockerfile b/Dockerfile
index 3d6d6212d8dc4401373873cf3d9bb67cf5cfbecb..2b36581d28d6ceebe2a891d35abe15fb9da410a3 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder\r
+FROM node:20.2-alpine as builder\r
 RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache\r
 RUN curl -sf https://gobinaries.com/tj/node-prune | sh\r
 \r

diff --git a/dev.dockerfile b/dev.dockerfile
index 0e925c0a90dfca99dceb40c7186bc82e79fb757d..3bfc10daed7f14b92853e908e5e16c488f45e1e3 100644 (file)
--- a/dev.dockerfile
+++ b/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder\r
+FROM node:20.2-alpine as builder\r
 RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache\r
 \r
 WORKDIR /usr/src/app\r