diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7f52e17..d8bd926 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "../builders/Linux/Dockerfile", "context": "../builders", - "cacheFrom": "type=registry,ref=ghcr.io/rectalogic/mediafx:buildcache", + "cacheFrom": "type=registry,ref=ghcr.io/rectalogic/mediafx-qt:buildcache", "args": { "QT_VER": "6.8.0", "QT_INSTALLER_VER": "4.8.1" @@ -46,4 +46,4 @@ } } } -} +} \ No newline at end of file diff --git a/builders/Linux/Dockerfile b/builders/Linux/Dockerfile index 9976844..1da5379 100644 --- a/builders/Linux/Dockerfile +++ b/builders/Linux/Dockerfile @@ -5,9 +5,9 @@ ARG UBUNTU=noble -FROM ubuntu:${UBUNTU} as base +FROM ubuntu:${UBUNTU} AS base -ENV container docker +ENV container=docker ENV DEBIAN_FRONTEND=noninteractive ENV LANG=en_US.UTF-8 ENV LC_ALL=C.UTF-8 @@ -30,11 +30,11 @@ RUN apt-get -y update && apt-get -y install \ libxkbcommon-x11-0 -FROM base as qt +FROM base AS qt ARG QT_VER ARG QT_INSTALLER_VER -ENV container docker +ENV container=docker ENV DEBIAN_FRONTEND=noninteractive ENV LANG=en_US.UTF-8 ENV LC_ALL=C.UTF-8 @@ -76,7 +76,7 @@ RUN --mount=type=secret,id=qtaccount,target=/root/.local/share/Qt/qtaccount.ini EOF -FROM base as mediafx +FROM base AS mediafx LABEL maintainer=rectalogic ARG QT_VER ARG UBUNTU=noble @@ -85,7 +85,7 @@ ENV GALLIUM_DRIVER=softpipe ENV LIBGL_ALWAYS_SOFTWARE=1 ENV DRI_NO_MSAA=1 -ENV container docker +ENV container=docker ENV DEBIAN_FRONTEND=noninteractive ENV LANG=en_US.UTF-8 ENV LC_ALL=C.UTF-8 diff --git a/builders/Linux/docker-build.sh b/builders/Linux/docker-build.sh index 8e2a77f..3ef9ce7 100755 --- a/builders/Linux/docker-build.sh +++ b/builders/Linux/docker-build.sh @@ -18,4 +18,4 @@ if [[ ! $QTACCOUNT ]]; then fi fi -docker buildx build --secret id=qtaccount,src="$QTACCOUNT" --build-arg UBUNTU=${UBUNTU:-noble} --build-arg QT_VER=${QT_VER:?} --build-arg QT_INSTALLER_VER=${QT_INSTALLER_VER:?} --platform linux/amd64 --memory-swap -1 --load --tag ghcr.io/rectalogic/mediafx:${UBUNTU:-noble}-$(git branch --show-current) --file "${CURRENT}/Dockerfile" "${CURRENT}/.." +docker buildx build --secret id=qtaccount,src="$QTACCOUNT" --build-arg UBUNTU=${UBUNTU:-noble} --build-arg QT_VER=${QT_VER:?} --build-arg QT_INSTALLER_VER=${QT_INSTALLER_VER:?} --platform linux/amd64 --memory-swap -1 --load --tag ghcr.io/rectalogic/mediafx-qt:${UBUNTU:-noble}-$(git branch --show-current) --file "${CURRENT}/Dockerfile" "${CURRENT}/.." diff --git a/builders/Linux/docker-run.sh b/builders/Linux/docker-run.sh index 0c9b6cf..e5837d1 100755 --- a/builders/Linux/docker-run.sh +++ b/builders/Linux/docker-run.sh @@ -7,4 +7,4 @@ MOUNT="$(cd "${BASH_SOURCE%/*}/../.."; pwd)" # opengl or vulkan TARGET=${TARGET:-opengl} docker run ${DOCKER_OPTS} -e QSG_RHI_BACKEND=${TARGET} --rm --init \ - --mount="type=bind,src=${MOUNT},dst=/mediafx,consistency=cached" ghcr.io/rectalogic/mediafx:${UBUNTU:-noble}-$(git branch --show-current) "$@" + --mount="type=bind,src=${MOUNT},dst=/mediafx,consistency=cached" ghcr.io/rectalogic/mediafx-qt:${UBUNTU:-noble}-$(git branch --show-current) "$@"