Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer into webhook-rewrite

Author: mchangrh

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+- [ ] I agree to license my contribution under AGPL-3.0-only with my contribution automatically being licensed under LGPL-3.0 additionally after 6 months
+
+***

.github/workflows/ci.yml

@@ -13,8 +13,10 @@ jobs:
 
     steps:
       # Initialization
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
       - run: npm install
       - name: Run Tests
         timeout-minutes: 5

.github/workflows/eslint.yml

@@ -13,8 +13,10 @@ jobs:
 
     steps:
       # Initialization
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
       - run: npm install
       - name: Run Tests
         timeout-minutes: 5

.github/workflows/generate-sqlite-base.yml

@@ -14,16 +14,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
       - run: npm install
       - name: Set config
         run: |
           echo '{"mode": "init-db-and-exit"}' > config.json
       - name: Run Server
         timeout-minutes: 10
         run: npm start
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: SponsorTimesDB.db
           path: databases/sponsorTimes.db

.github/workflows/postgres-redis-ci.yml

@@ -12,15 +12,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build the docker-compose stack
         env:
           PG_USER: ci_db_user
           PG_PASS: ci_db_pass
         run: docker-compose -f docker/docker-compose-ci.yml up -d
       - name: Check running containers
         run: docker ps
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
       - run: npm install
       - name: Run Tests
         env:

Dockerfile

@@ -1,16 +1,16 @@
-FROM node:16-alpine as builder
+FROM node:18-alpine as builder
 RUN apk add --no-cache --virtual .build-deps python3 make g++
 COPY package.json package-lock.json tsconfig.json entrypoint.sh ./
 COPY src src
 RUN npm ci && npm run tsc
 
-FROM node:16-alpine as app
+FROM node:18-alpine as app
 WORKDIR /usr/src/app
-RUN apk add git postgresql-client
+RUN apk add --no-cache git postgresql-client
 COPY --from=builder ./node_modules ./node_modules
 COPY --from=builder ./dist ./dist
 COPY ./.git ./.git
 COPY entrypoint.sh .
 COPY databases/*.sql databases/
 EXPOSE 8080
-CMD ./entrypoint.sh
+CMD ./entrypoint.sh