feat: Merge recorder and ffmpeg to base (#21)

## Description

**What(what issue does this code solve/what feature does it add):**
We do not need the ffmpeg and recorder all sitting differently, as this
will increase our docker image size
**How(how does it solve it):**

## Required Checklist:

- [ ] I have added any necessary documentation and comments in my code
(where appropriate)
- [ ] I have added tests to make sure my code runs in all contexts

## Further comments
This commit is contained in:
Wanjohi
2024-04-15 10:40:03 +03:00
committed by GitHub
parent 5d3d4acde7
commit e7f5666d7a
9 changed files with 70 additions and 143 deletions

View File

@@ -1,19 +1,19 @@
#Tabs not spaces, you moron :)
name: CI for netris:ffmpeg
name: CI for netris:base
on:
pull_request:
paths:
- "ffmpeg.Dockerfile"
- ".github/workflows/ffmpeg.yml"
- "base.Dockerfile"
- ".github/workflows/base.yml"
schedule:
- cron: 0 0 * * * # At the end of everyday
push:
branches: [main]
paths:
- "ffmpeg.Dockerfile"
- ".github/workflows/ffmpeg.yml"
- "base.Dockerfile"
- ".github/workflows/base.yml"
tags:
- v*.*.*
release:
@@ -26,7 +26,7 @@ concurrency:
env:
REGISTRY: ghcr.io
IMAGE_NAME: wanjohiryan/netris
BASE_TAG_PREFIX: ffmpeg
BASE_TAG_PREFIX: base
jobs:
build-docker-pr:
@@ -44,11 +44,11 @@ jobs:
name: Build Docker image
uses: docker/build-push-action@v5
with:
file: ffmpeg.Dockerfile
file: base.Dockerfile
context: ./
push: false
load: true
tags: netris:ffmpeg
tags: netris:base
build-docker-main:
name: Build image on merge
@@ -86,7 +86,7 @@ jobs:
name: Build Docker image
uses: docker/build-push-action@v5
with:
file: ffmpeg.Dockerfile
file: base.Dockerfile
context: ./
push: true
tags: ${{ steps.meta.outputs.tags }}

View File

@@ -1,93 +0,0 @@
#Tabs not spaces, you moron :)
name: CI for netris:recorder
on:
pull_request:
paths:
- "recorder.Dockerfile"
- ".github/workflows/recorder.yml"
schedule:
- cron: 0 0 * * * # At the end of everyday
push:
branches: [main]
paths:
- "recorder.Dockerfile"
- ".github/workflows/recorder.yml"
tags:
- v*.*.*
release:
types: [created]
concurrency:
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
cancel-in-progress: true
env:
REGISTRY: ghcr.io
IMAGE_NAME: wanjohiryan/netris
BASE_TAG_PREFIX: recorder
jobs:
build-docker-pr:
name: Build image on pr
runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }}
steps:
-
name: Checkout repo
uses: actions/checkout@v4
-
name: Setup Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: Build Docker image
uses: docker/build-push-action@v5
with:
file: recorder.Dockerfile
context: ./
push: false
load: true
tags: netris:recorder
build-docker-main:
name: Build image on merge
if: ${{github.ref == 'refs/heads/main'}}
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
-
name: Checkout repo
uses: actions/checkout@v4
-
name: Log into registry ${{ env.REGISTRY }}
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Extract Container metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }}
#
#tag on release, and a nightly build for 'dev'
tags: |
type=raw,value=nightly,enable={{is_default_branch}}
type=ref,event=tag
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
-
name: Build Docker image
uses: docker/build-push-action@v5
with:
file: recorder.Dockerfile
context: ./
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}