diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 321035a4..1fbc2fd8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,15 +12,18 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@main - - uses: actions/setup-node@main + - name: Checkout repository + uses: actions/checkout@main + - name: Setup Node + uses: actions/setup-node@main with: node-version: 'current' check-latest: true + cache: 'npm' - name: npm run lint run: | - npm config set fund false + npm config set -g fund false cd src npm ci --legacy-peer-deps npm run lint diff --git a/.github/workflows/npm-update-bot.yml b/.github/workflows/npm-update-bot.yml index 743cbd16..1bea6940 100644 --- a/.github/workflows/npm-update-bot.yml +++ b/.github/workflows/npm-update-bot.yml @@ -11,15 +11,18 @@ jobs: name: NPM Update Bot 🤖 runs-on: ubuntu-latest steps: - - uses: actions/checkout@main - - uses: actions/setup-node@main + - name: Checkout repository + uses: actions/checkout@main + - name: Setup Node + uses: actions/setup-node@main with: node-version: 'current' check-latest: true + cache: 'npm' - name: Bot 🤖 "Updating NPM Packages..." run: | - npm config set fund false + npm config set -g fund false npm update cd src npm update diff --git a/Dockerfile b/Dockerfile index ea216a3a..7b1714b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,24 @@ # There's an issue with node:20-alpine. # 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 src/ /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. # 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 # 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 # 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 RUN apk add -U --no-cache \ - wireguard-tools \ - dumb-init + wireguard-tools \ + dumb-init # Expose Ports EXPOSE 51820/udp