Skip to content
This repository has been archived by the owner on Apr 3, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build-publish-docker-video-control.yml
#	.github/workflows/build-publish-docker-video.yml
  • Loading branch information
robere2 committed Sep 28, 2022
2 parents 2a4c2cf + 267fc21 commit 3c0b0f1
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ env:
IMAGE_NAME: rpitv/glimpse-video-control

jobs:
build-image:
build-and-test-image:
name: Build and Test Image
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
Expand Down Expand Up @@ -53,17 +53,10 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: ./control
push: false
platforms: linux/amd64,linux/arm64
tags: ghcr.io/rpitv/glimpse-video-control:${{ github.sha }}
labels: ${{ steps.meta.outputs.labels }}
tags: ghcr.io/rpitv/glimpse-video-control:${{ github.run_id }}
29 changes: 29 additions & 0 deletions .github/workflows/codeql-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: "Scheduled CodeQL Analysis"

on:
schedule:
- cron: "45 20 * * 5"

jobs:
# Analyze code for vulnerabilities
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
security-events: write

strategy:
fail-fast: false
matrix:
language: ["typescript"]
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Run the following commands to set up your project.
git clone git@github.com:rpitv/glimpse-video.git
cd glimpse-video/control
npm install
npm run prepare
```

### Building
Expand All @@ -69,7 +70,7 @@ npm run build

The ingestion server is nothing but an Nginx configuration file, so there's no need to build anything but the Nginx server + module, or just use a Docker container.

To build a Docker container image, run:
To build the Docker container images, run:
```shell
docker build -t ghcr.io/rpitv/glimpse-video .
cd control
Expand Down Expand Up @@ -108,7 +109,7 @@ npm run fix

This command will automatically run in a pre-commit Git hook.

## Api Reference
## API Reference

TODO

Expand Down

0 comments on commit 3c0b0f1

Please sign in to comment.