fix: include version variable inside containers
This commit is contained in:
parent
956d19ec95
commit
09a75570f3
|
@ -22,6 +22,8 @@ runs:
|
||||||
context: .
|
context: .
|
||||||
pull: true
|
pull: true
|
||||||
push: ${{ github.event_name == 'push' }}
|
push: ${{ github.event_name == 'push' }}
|
||||||
|
build-args: |
|
||||||
|
LIBRETIME_VERSION=${{ env.LIBRETIME_VERSION }}
|
||||||
target: ${{ inputs.target }}
|
target: ${{ inputs.target }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
|
@ -30,6 +30,11 @@ jobs:
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
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
|
- name: Build python-builder
|
||||||
uses: docker/build-push-action@v3
|
uses: docker/build-push-action@v3
|
||||||
with:
|
with:
|
||||||
|
|
16
Dockerfile
16
Dockerfile
|
@ -1,3 +1,4 @@
|
||||||
|
ARG LIBRETIME_VERSION
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
# Python Builder #
|
# Python Builder #
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
|
@ -89,6 +90,9 @@ WORKDIR /app
|
||||||
|
|
||||||
CMD ["/usr/local/bin/libretime-analyzer"]
|
CMD ["/usr/local/bin/libretime-analyzer"]
|
||||||
|
|
||||||
|
ARG LIBRETIME_VERSION
|
||||||
|
ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
|
||||||
|
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
# API #
|
# API #
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
|
@ -126,6 +130,9 @@ CMD ["/usr/local/bin/gunicorn", \
|
||||||
"--bind=0.0.0.0:9001", \
|
"--bind=0.0.0.0:9001", \
|
||||||
"libretime_api.asgi"]
|
"libretime_api.asgi"]
|
||||||
|
|
||||||
|
ARG LIBRETIME_VERSION
|
||||||
|
ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
|
||||||
|
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
# Playout #
|
# Playout #
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
|
@ -161,6 +168,9 @@ WORKDIR /app
|
||||||
|
|
||||||
CMD ["/usr/local/bin/libretime-playout"]
|
CMD ["/usr/local/bin/libretime-playout"]
|
||||||
|
|
||||||
|
ARG LIBRETIME_VERSION
|
||||||
|
ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
|
||||||
|
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
# Worker #
|
# Worker #
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
|
@ -191,6 +201,9 @@ CMD ["/usr/local/bin/celery", "worker", \
|
||||||
"--concurrency=1", \
|
"--concurrency=1", \
|
||||||
"--loglevel=info"]
|
"--loglevel=info"]
|
||||||
|
|
||||||
|
ARG LIBRETIME_VERSION
|
||||||
|
ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
|
||||||
|
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
# Legacy #
|
# Legacy #
|
||||||
#======================================================================================#
|
#======================================================================================#
|
||||||
|
@ -260,3 +273,6 @@ RUN composer --no-cache dump-autoload --no-interaction --no-dev
|
||||||
|
|
||||||
# Run
|
# Run
|
||||||
USER ${UID}:${GID}
|
USER ${UID}:${GID}
|
||||||
|
|
||||||
|
ARG LIBRETIME_VERSION
|
||||||
|
ENV LIBRETIME_VERSION=$LIBRETIME_VERSION
|
||||||
|
|
|
@ -403,6 +403,10 @@ class Config
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (getenv('LIBRETIME_VERSION')) {
|
||||||
|
$version = trim(getenv('LIBRETIME_VERSION'));
|
||||||
|
}
|
||||||
|
|
||||||
self::$legacy_values['airtime_version'] = $version;
|
self::$legacy_values['airtime_version'] = $version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue