diff --git a/.github/workflows/actions/build-container/action.yml b/.github/workflows/actions/build-container/action.yml index a36d95e2d..804904aab 100644 --- a/.github/workflows/actions/build-container/action.yml +++ b/.github/workflows/actions/build-container/action.yml @@ -22,6 +22,8 @@ runs: context: . pull: true push: ${{ github.event_name == 'push' }} + build-args: | + LIBRETIME_VERSION=${{ env.LIBRETIME_VERSION }} target: ${{ inputs.target }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index d10185f78..eb831f72c 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -30,6 +30,11 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Guess LIBRETIME_VERSION + run: | + make VERSION + echo "LIBRETIME_VERSION=$(cat VERSION | tr -d [:blank:])" >> $GITHUB_ENV + - name: Build python-builder uses: docker/build-push-action@v3 with: diff --git a/Dockerfile b/Dockerfile index 8a7dded58..6f16b8bfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +ARG LIBRETIME_VERSION #======================================================================================# # Python Builder # #======================================================================================# @@ -89,6 +90,9 @@ WORKDIR /app CMD ["/usr/local/bin/libretime-analyzer"] +ARG LIBRETIME_VERSION +ENV LIBRETIME_VERSION=$LIBRETIME_VERSION + #======================================================================================# # API # #======================================================================================# @@ -126,6 +130,9 @@ CMD ["/usr/local/bin/gunicorn", \ "--bind=0.0.0.0:9001", \ "libretime_api.asgi"] +ARG LIBRETIME_VERSION +ENV LIBRETIME_VERSION=$LIBRETIME_VERSION + #======================================================================================# # Playout # #======================================================================================# @@ -161,6 +168,9 @@ WORKDIR /app CMD ["/usr/local/bin/libretime-playout"] +ARG LIBRETIME_VERSION +ENV LIBRETIME_VERSION=$LIBRETIME_VERSION + #======================================================================================# # Worker # #======================================================================================# @@ -191,6 +201,9 @@ CMD ["/usr/local/bin/celery", "worker", \ "--concurrency=1", \ "--loglevel=info"] +ARG LIBRETIME_VERSION +ENV LIBRETIME_VERSION=$LIBRETIME_VERSION + #======================================================================================# # Legacy # #======================================================================================# @@ -260,3 +273,6 @@ RUN composer --no-cache dump-autoload --no-interaction --no-dev # Run USER ${UID}:${GID} + +ARG LIBRETIME_VERSION +ENV LIBRETIME_VERSION=$LIBRETIME_VERSION diff --git a/legacy/application/configs/conf.php b/legacy/application/configs/conf.php index 7e0856ce6..0ce99ce0c 100644 --- a/legacy/application/configs/conf.php +++ b/legacy/application/configs/conf.php @@ -403,6 +403,10 @@ class Config } } + if (getenv('LIBRETIME_VERSION')) { + $version = trim(getenv('LIBRETIME_VERSION')); + } + self::$legacy_values['airtime_version'] = $version; }