From d9af63c55d657f12345026ea92a4763d5b2e3912 Mon Sep 17 00:00:00 2001 From: beasteers Date: Thu, 6 Apr 2023 19:19:44 -0400 Subject: [PATCH 1/5] add omnimix outputs --- .../tabs/DebuggingDataView/DebuggingDataView.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx b/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx index 4d9f517..c4710f2 100644 --- a/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx +++ b/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx @@ -24,9 +24,18 @@ function DebuggingDataView() { {data => ()} - - - {data => ()} + + + {data => ()} + + + {data => ()} + + + {data => ()} + + + {data => ()} {/* */} From e70f5fe9ef137144807117c633bbc8023d30b2db Mon Sep 17 00:00:00 2001 From: beasteers Date: Fri, 7 Apr 2023 14:29:53 -0400 Subject: [PATCH 2/5] tweak dashboard access --- docker-compose.prod.yml | 3 ++- frontend/src/config.ts | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 04a90e8..86dc94d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -5,6 +5,7 @@ services: restart: always ports: - "3000:80" + - "8033:80" networks: - web - default @@ -21,7 +22,7 @@ services: container_name: dashdocs restart: always ports: - - "8034:80" + - "8029:80" networks: - web - default diff --git a/frontend/src/config.ts b/frontend/src/config.ts index 36985a8..e3390bb 100644 --- a/frontend/src/config.ts +++ b/frontend/src/config.ts @@ -1,5 +1,7 @@ // export const API_URL = 'https://api.ptg.poly.edu'; -export const API_URL = 'http://dashboardptg.vida-nyu.org:7890'; +//export const API_URL = 'http://dashboardptg.vida-nyu.org:7890'; +const {protocol, hostname, port} = window.location; +export const API_URL = `${protocol}//${hostname}${port ? ":7890" : ""}` export const RECORDINGS_STATIC_PATH = '/recordings/static/'; export const TEST_USER = 'test'; export const TEST_PASS = 'test'; @@ -15,4 +17,4 @@ export const MAIN_STREAM = 'main'; export const RECORDINGS_UPLOAD_PATh = "/recordings/upload/" -// export {API_URL, RECORDINGS_STATIC_PATH, TEST_USER, TEST_PASS}; \ No newline at end of file +// export {API_URL, RECORDINGS_STATIC_PATH, TEST_USER, TEST_PASS}; From f27046636513eb5928b7adecf1beef6709495dd9 Mon Sep 17 00:00:00 2001 From: Bea Steers Date: Wed, 9 Oct 2024 13:23:00 -0400 Subject: [PATCH 3/5] add second model outputs --- frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx b/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx index c4710f2..376836a 100644 --- a/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx +++ b/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx @@ -28,6 +28,9 @@ function DebuggingDataView() { {data => ()} + + {data => ()} + {data => ()} From 5920dbe508400b8d7d5e87b03c43c513215e841c Mon Sep 17 00:00:00 2001 From: Bea Steers Date: Wed, 9 Oct 2024 13:24:46 -0400 Subject: [PATCH 4/5] remove unused + trigger action --- frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx b/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx index 376836a..09abca8 100644 --- a/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx +++ b/frontend/src/tabs/DebuggingDataView/DebuggingDataView.tsx @@ -31,15 +31,15 @@ function DebuggingDataView() { {data => ()} - +{/* {data => ()} {data => ()} - - + */} +{/* {data => ()} - + */} {/* */} From 64e113e2a702de74c333356fe03f64948fd0daa0 Mon Sep 17 00:00:00 2001 From: Bea Steers Date: Wed, 9 Oct 2024 13:32:27 -0400 Subject: [PATCH 5/5] Create docker-publish.yaml --- .github/workflows/docker-publish.yaml | 99 +++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 .github/workflows/docker-publish.yaml diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml new file mode 100644 index 0000000..7a915ef --- /dev/null +++ b/.github/workflows/docker-publish.yaml @@ -0,0 +1,99 @@ +name: Docker + +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +on: + schedule: + - cron: '41 8 * * *' + push: + branches: [ "omnimix-outputs" ] + # Publish semver tags as releases. + tags: [ 'v*.*.*' ] + pull_request: + branches: [ "omnimix-outputs" ] + +env: + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io + # github.repository as / + IMAGE_NAME: ${{ github.repository }} + + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + # This is used to complete the identity challenge + # with sigstore/fulcio when running outside of PRs. + id-token: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Install the cosign tool except on PR + # https://github.com/sigstore/cosign-installer + - name: Install cosign + if: github.event_name != 'pull_request' + uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1 + with: + cosign-release: 'v2.1.1' + + # Set up BuildKit Docker container builder to be able to build + # multi-platform images and export cache + # https://github.com/docker/setup-buildx-action + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0 + + # Login against a Docker registry except on PR + # https://github.com/docker/login-action + - name: Log into registry ${{ env.REGISTRY }} + if: github.event_name != 'pull_request' + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Extract metadata (tags, labels) for Docker + # https://github.com/docker/metadata-action + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + # Build and push Docker image with Buildx (don't push on PR) + # https://github.com/docker/build-push-action + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 + with: + context: ./frontend + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + platforms: linux/amd64,linux/arm64 + cache-from: type=gha + cache-to: type=gha,mode=max + + # Sign the resulting Docker image digest except on PRs. + # This will only write to the public Rekor transparency log when the Docker + # repository is public to avoid leaking data. If you would like to publish + # transparency data even for private images, pass --force to cosign below. + # https://github.com/sigstore/cosign + - name: Sign the published Docker image + if: ${{ github.event_name != 'pull_request' }} + env: + # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable + TAGS: ${{ steps.meta.outputs.tags }} + DIGEST: ${{ steps.build-and-push.outputs.digest }} + # This step uses the identity token to provision an ephemeral certificate + # against the sigstore community Fulcio instance. + run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}