Browse Source

Merge branch 'main' into darkmode

pull/686/head
Philip H 1 year ago
committed by GitHub
parent
commit
a0a3f4bcb3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      .github/workflows/lint.yml
  2. 9
      .github/workflows/npm-update-bot.yml
  3. 21
      Dockerfile

9
.github/workflows/lint.yml

@ -12,15 +12,18 @@ jobs:
name: Lint name: Lint
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@main - name: Checkout repository
- uses: actions/setup-node@main uses: actions/checkout@main
- name: Setup Node
uses: actions/setup-node@main
with: with:
node-version: 'current' node-version: 'current'
check-latest: true check-latest: true
cache: 'npm'
- name: npm run lint - name: npm run lint
run: | run: |
npm config set fund false npm config set -g fund false
cd src cd src
npm ci --legacy-peer-deps npm ci --legacy-peer-deps
npm run lint npm run lint

9
.github/workflows/npm-update-bot.yml

@ -11,15 +11,18 @@ jobs:
name: NPM Update Bot 🤖 name: NPM Update Bot 🤖
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@main - name: Checkout repository
- uses: actions/setup-node@main uses: actions/checkout@main
- name: Setup Node
uses: actions/setup-node@main
with: with:
node-version: 'current' node-version: 'current'
check-latest: true check-latest: true
cache: 'npm'
- name: Bot 🤖 "Updating NPM Packages..." - name: Bot 🤖 "Updating NPM Packages..."
run: | run: |
npm config set fund false npm config set -g fund false
npm update npm update
cd src cd src
npm update npm update

21
Dockerfile

@ -1,15 +1,24 @@
# There's an issue with node:20-alpine. # There's an issue with node:20-alpine.
# Docker deployment is canceled after 25< minutes. # Docker deployment is canceled after 25< minutes.
FROM docker.io/library/node:18-alpine@sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d AS build_node_modules FROM docker.io/library/node:18-alpine@sha256:16b46e5ea9fb5c2d13dda36f0feb670fa89de6a412725007555f2eee9a126b60 AS build_node_modules
# Hide fund and update-notifier message
RUN npm config set -g fund false &&\
npm config set -g update-notifier false
# Copy Web UI # Copy Web UI
COPY src/ /app/ COPY src/ /app/
WORKDIR /app WORKDIR /app
RUN npm config set fund false && npm ci --legacy-peer-deps RUN npm ci --legacy-peer-deps
# Copy build result to a new image. # Copy build result to a new image.
# This saves a lot of disk space. # This saves a lot of disk space.
FROM docker.io/library/node:18-alpine@sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d FROM docker.io/library/node:18-alpine@sha256:16b46e5ea9fb5c2d13dda36f0feb670fa89de6a412725007555f2eee9a126b60
# Hide fund and update-notifier message
RUN npm config set -g fund false &&\
npm config set -g update-notifier false
COPY --from=build_node_modules /app /app COPY --from=build_node_modules /app /app
# Move node_modules one directory up, so during development # Move node_modules one directory up, so during development
@ -22,12 +31,12 @@ COPY --from=build_node_modules /app /app
RUN mv /app/node_modules /node_modules RUN mv /app/node_modules /node_modules
# Enable this to run `npm run serve` # Enable this to run `npm run serve`
RUN npm config set fund false && npm i -g nodemon RUN npm i -g nodemon
# Install Linux packages # Install Linux packages
RUN apk add -U --no-cache \ RUN apk add -U --no-cache \
wireguard-tools \ wireguard-tools \
dumb-init dumb-init
# Expose Ports # Expose Ports
EXPOSE 51820/udp EXPOSE 51820/udp

Loading…
Cancel
Save