diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 1c77274996..1cb5668155 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -43,7 +43,11 @@ jobs: - name: Output branch name run: echo ${BRANCH} - name: Sets build date - run: echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV + run: | + echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV + make set_nightly_env + cat .env | xargs -I {} echo {} >> $GITHUB_ENV + echo $BASE_RELEASE $BASE_VERSION - name: Build Docker images run: VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build - name: Test Docker images diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml index e843189174..681ddc28e1 100644 --- a/.github/workflows/helm-chart-test.yml +++ b/.github/workflows/helm-chart-test.yml @@ -93,6 +93,9 @@ jobs: run: | echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV + make set_nightly_env + cat .env | xargs -I {} echo {} >> $GITHUB_ENV + echo $BASE_RELEASE $BASE_VERSION - name: Setup Kubernetes environment uses: nick-invision/retry@master with: diff --git a/.github/workflows/test-video.yml b/.github/workflows/test-video.yml index e35100eb42..0ee0d8af75 100644 --- a/.github/workflows/test-video.yml +++ b/.github/workflows/test-video.yml @@ -59,7 +59,11 @@ jobs: - name: Output branch name run: echo ${BRANCH} - name: Sets build date - run: echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV + run: | + echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV + make set_nightly_env + cat .env | xargs -I {} echo {} >> $GITHUB_ENV + echo $BASE_RELEASE $BASE_VERSION - name: Pre-build to reduce logs in test phase run: | VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make hub diff --git a/Base/Dockerfile b/Base/Dockerfile index 3297a4f4f4..59f9f75835 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM ubuntu:jammy-20240227 LABEL authors="Selenium " # Arguments to define the version of dependencies to download diff --git a/Makefile b/Makefile index d463482810..c01643dc25 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,9 @@ BUILD_ARGS := $(BUILD_ARGS) MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION))) MINOR := $(word 2,$(subst ., ,$(TAG_VERSION))) MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION))) -FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-6.1) +FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.0) FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),ndviet) -FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),6.1-ubuntu2204) +FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),7.0-ubuntu2204) all: hub \ distributor \ @@ -37,6 +37,10 @@ all: hub \ standalone_docker \ video +set_nightly_env: + echo BASE_VERSION=$(BASE_VERSION_NIGHTLY) > .env ; \ + echo BASE_RELEASE=$(BASE_RELEASE_NIGHTLY) >> .env ; + build_nightly: BASE_VERSION=$(BASE_VERSION_NIGHTLY) BASE_RELEASE=$(BASE_RELEASE_NIGHTLY) make build