pull/165/head
undefined 3 years ago
parent f4dca478be
commit 44de90bcab

@ -46,55 +46,55 @@ jobs:
- name: Publish - name: Publish
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' }}
run: node build/publish.js run: node build/publish.js
web: # web:
needs: build # needs: build
permissions: # permissions:
packages: write # packages: write
contents: read # contents: read
runs-on: ubuntu-latest # runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' }} # if: ${{ github.event_name == 'push' }}
steps: # steps:
- name: Check out # - name: Check out
uses: actions/checkout@v2 # uses: actions/checkout@v2
with: # with:
submodules: recursive # submodules: recursive
- name: Log in to GitHub Docker Registry # - name: Log in to GitHub Docker Registry
uses: docker/login-action@v1 # uses: docker/login-action@v1
with: # with:
registry: docker.pkg.github.com # registry: docker.pkg.github.com
username: ${{ github.actor }} # username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} # password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker:Web # - name: Docker:Web
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
push: true # push: true
context: ./install/docker/backend # context: ./install/docker/backend
tags: | # tags: |
docker.pkg.github.com/hydro-dev/web:${{ github.sha }} # docker.pkg.github.com/hydro-dev/web:${{ github.sha }}
docker.pkg.github.com/hydro-dev/web:${{ github.ref }} # docker.pkg.github.com/hydro-dev/web:${{ github.ref }}
judge: # judge:
needs: build # needs: build
if: ${{ github.event_name == 'push' }} # if: ${{ github.event_name == 'push' }}
permissions: # permissions:
packages: write # packages: write
contents: read # contents: read
runs-on: ubuntu-latest # runs-on: ubuntu-latest
steps: # steps:
- name: Check out # - name: Check out
uses: actions/checkout@v2 # uses: actions/checkout@v2
with: # with:
submodules: recursive # submodules: recursive
- name: Log in to GitHub Docker Registry # - name: Log in to GitHub Docker Registry
uses: docker/login-action@v1 # uses: docker/login-action@v1
with: # with:
registry: docker.pkg.github.com # registry: docker.pkg.github.com
username: ${{ github.actor }} # username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} # password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker:Judge # - name: Docker:Judge
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
push: true # push: true
context: ./install/docker/judge # context: ./install/docker/judge
tags: | # tags: |
docker.pkg.github.com/hydro-dev/judge:${{ github.sha }} # docker.pkg.github.com/hydro-dev/judge:${{ github.sha }}
docker.pkg.github.com/hydro-dev/judge:${{ github.ref }} # docker.pkg.github.com/hydro-dev/judge:${{ github.ref }}

@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.29.35", "version": "2.29.36",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "dist/loader.js", "main": "dist/loader.js",
"typings": "dist/loader.d.ts", "typings": "dist/loader.d.ts",

@ -361,7 +361,7 @@ export class HandlerCommon {
!this.request.host !this.request.host
|| (this.domain?.host instanceof Array || (this.domain?.host instanceof Array
? (!this.domain.host.includes(this.request.host)) ? (!this.domain.host.includes(this.request.host))
: this.domain.host !== this.domain?.host) : this.request.host !== this.domain?.host)
)) { )) {
name += '_with_domainId'; name += '_with_domainId';
args.domainId = this.domainId; args.domainId = this.domainId;

Loading…
Cancel
Save