mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-08-04 00:13:33 +00:00
update nginx/dep updates/fix eslint/change line endings
Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
6
.github/workflows/docker.yml
vendored
6
.github/workflows/docker.yml
vendored
@@ -10,6 +10,7 @@ on:
|
||||
- backend/**
|
||||
- global/**
|
||||
- rootfs/**
|
||||
- src/**
|
||||
pull_request:
|
||||
paths:
|
||||
- .github/workflows/docker.yml
|
||||
@@ -18,6 +19,7 @@ on:
|
||||
- backend/**
|
||||
- global/**
|
||||
- rootfs/**
|
||||
- src/**
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
build:
|
||||
@@ -68,8 +70,6 @@ jobs:
|
||||
tags: |
|
||||
${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
|
||||
ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
|
||||
build-args: |
|
||||
"BUILD=${{ steps.rn.outputs.rn }}"
|
||||
- name: show version
|
||||
if: ${{ github.event_name != 'pull_request' }}
|
||||
run: |
|
||||
@@ -88,8 +88,6 @@ jobs:
|
||||
platforms: linux/amd64,linux/arm64 #,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4 #,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
|
||||
push: ${{ github.event_name == 'pull_request' }}
|
||||
tags: ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ steps.pr.outputs.pr }}
|
||||
build-args: |
|
||||
"BUILD=${{ steps.rn.outputs.rn }}"
|
||||
- name: show version (PR)
|
||||
if: ${{ github.event_name == 'pull_request' }}
|
||||
run: docker run --rm --entrypoint nginx ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ steps.pr.outputs.pr }} -V
|
||||
|
3
.github/workflows/dockerlint.yml
vendored
3
.github/workflows/dockerlint.yml
vendored
@@ -18,9 +18,10 @@ jobs:
|
||||
run: |
|
||||
DOCKERFILES="$(find . -name "*Dockerfile*")"
|
||||
for file in $(echo "$DOCKERFILES" | tr " " "\n"); do
|
||||
# DL3003 warning: Use WORKDIR to switch to a directory
|
||||
# DL3018 warning: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`
|
||||
# DL3013 warning: Pin versions in pip. Instead of `pip install <package>` use `pip install <package>==<version>` or `pip install --requirement <requirements file>`
|
||||
hadolint "$file" --ignore DL3013 --ignore DL3018 | tee -a hadolint.log
|
||||
hadolint "$file" --ignore DL3003 --ignore DL3013 --ignore DL3018 | tee -a hadolint.log
|
||||
done
|
||||
if grep -q "DL[0-9]\+\|SC[0-9]\+" hadolint.log; then
|
||||
exit 1
|
||||
|
2
.github/workflows/json.yml
vendored
2
.github/workflows/json.yml
vendored
@@ -11,4 +11,4 @@ jobs:
|
||||
- name: json-syntax-check
|
||||
uses: limitusus/json-syntax-check@v2
|
||||
with:
|
||||
pattern: "\\.json$*"
|
||||
pattern: "\\.json"
|
||||
|
2
.github/workflows/spellcheck.yml
vendored
2
.github/workflows/spellcheck.yml
vendored
@@ -15,4 +15,4 @@ jobs:
|
||||
with:
|
||||
check_filenames: true
|
||||
check_hidden: true
|
||||
skip: .gitignore,block-exploits.conf,showdown.min.js,jquery.min.js,xregexp-all.js
|
||||
skip: .git,.gitignore,showdown.min.js,jquery.min.js,xregexp-all.js
|
||||
|
10
.github/workflows/update-and-lint.yml
vendored
10
.github/workflows/update-and-lint.yml
vendored
@@ -1,6 +1,8 @@
|
||||
name: update-and-lint
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- develop
|
||||
schedule:
|
||||
- cron: "0 */6 * * *"
|
||||
workflow_dispatch:
|
||||
@@ -13,7 +15,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 19
|
||||
node-version: 21
|
||||
- name: eslint
|
||||
run: |
|
||||
cd backend
|
||||
@@ -23,9 +25,9 @@ jobs:
|
||||
run: |
|
||||
curl -L https://unpkg.com/xregexp/xregexp-all.js -o rootfs/nftd/xregexp-all.js
|
||||
curl -L https://unpkg.com/showdown/dist/showdown.min.js -o rootfs/nftd/showdown.min.js
|
||||
curl -L https://code.jquery.com/jquery-"$(git ls-remote --tags https://github.com/jquery/jquery | cut -d/ -f3 | sort -V | tail -1 | sed -E "s/\^\{\}//")".min.js -o rootfs/nftd/jquery.min.js
|
||||
curl -L https://cdn.jsdelivr.net/npm/bootstrap@"$(git ls-remote --tags https://github.com/twbs/bootstrap v3.3.* | cut -d/ -f3 | sort -V | tail -1 | sed -E "s/\^\{\}//")"/dist/css/bootstrap.min.css -o rootfs/html/404/bootstrap.min.css
|
||||
curl -L https://cdn.jsdelivr.net/npm/bootstrap@"$(git ls-remote --tags https://github.com/twbs/bootstrap v3.3.* | cut -d/ -f3 | sort -V | tail -1 | sed -E "s/\^\{\}//")"/dist/css/bootstrap.min.css -o rootfs/html/default/bootstrap.min.css
|
||||
curl -L https://code.jquery.com/jquery-"$(git ls-remote --tags https://github.com/jquery/jquery | cut -d/ -f3 | sort -V | tail -1)".min.js -o rootfs/nftd/jquery.min.js
|
||||
curl -L https://cdn.jsdelivr.net/npm/bootstrap@"$(git ls-remote --tags https://github.com/twbs/bootstrap v3.3.* | cut -d/ -f3 | sort -V | tail -1)"/dist/css/bootstrap.min.css -o rootfs/html/404/bootstrap.min.css
|
||||
curl -L https://cdn.jsdelivr.net/npm/bootstrap@"$(git ls-remote --tags https://github.com/twbs/bootstrap v3.3.* | cut -d/ -f3 | sort -V | tail -1)"/dist/css/bootstrap.min.css -o rootfs/html/default/bootstrap.min.css
|
||||
- name: nginxbeautifier
|
||||
run: |
|
||||
yarn global add nginxbeautifier
|
||||
|
20
.github/workflows/yq.yml
vendored
20
.github/workflows/yq.yml
vendored
@@ -1,20 +0,0 @@
|
||||
name: yq
|
||||
on:
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
yq:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.YQ }}
|
||||
- name: update workflows
|
||||
run: for workflow in .github/workflows/*.yml; do yq "$workflow" | tee "$workflow".tmp && mv "$workflow".tmp "$workflow"; done
|
||||
- name: push changes
|
||||
run: |
|
||||
git config user.name "GitHub"
|
||||
git config user.email "noreply@github.com"
|
||||
git add -A
|
||||
git diff-index --quiet HEAD || git commit -sm "yq"
|
||||
git push
|
Reference in New Issue
Block a user