diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 273182b8cf..646ed7c03e 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -48,6 +48,7 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} + type=sha,format=long type=sha,enable=true,prefix=sha-,format=short flavor: | latest=${{ matrix.flavor == 'cuda' && github.ref == 'refs/heads/main' }} @@ -89,7 +90,7 @@ jobs: build-args: PIP_EXTRA_INDEX_URL=${{ matrix.pip-extra-index-url }} cache-from: | type=gha - type=registry,ref=ghcr.io/${{ github.repository }}:main-${{ matrix.flavor }} + ghcr.io/${{ github.repository }}:main-${{ matrix.flavor }} cache-to: type=gha,mode=max - name: Docker Hub Description diff --git a/docker/Dockerfile b/docker/Dockerfile index 0507363f69..9b5a87f4a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \ RUN \ --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - apt update \ + apt-get update \ && apt-get install -y \ --no-install-recommends \ libgl1-mesa-glx=20.3.* \ @@ -46,7 +46,7 @@ RUN \ --mount=type=cache,target=${PIP_CACHE_DIR} \ --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - apt update \ + apt-get update \ && apt-get install -y \ --no-install-recommends \ build-essential=12.9 \ diff --git a/docker/build.sh b/docker/build.sh index 1bc233f222..dabbd8378a 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -37,7 +37,7 @@ fi # Build Container DOCKER_BUILDKIT=1 docker build \ - --platform="${PLATFORM:-Linux/amd64}" \ + --platform="${PLATFORM:-linux/amd64}" \ --tag="${CONTAINER_IMAGE:-invokeai}" \ ${CONTAINER_FLAVOR:+--build-arg="CONTAINER_FLAVOR=${CONTAINER_FLAVOR}"} \ ${PIP_EXTRA_INDEX_URL:+--build-arg="PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}"} \ diff --git a/docker/env.sh b/docker/env.sh index f6a7a2b206..f09c629112 100644 --- a/docker/env.sh +++ b/docker/env.sh @@ -34,7 +34,7 @@ REPOSITORY_NAME="${REPOSITORY_NAME-$(basename "$(git rev-parse --show-toplevel)" REPOSITORY_NAME="${REPOSITORY_NAME,,}" VOLUMENAME="${VOLUMENAME-"${REPOSITORY_NAME}_data"}" ARCH="${ARCH-$(uname -m)}" -PLATFORM="${PLATFORM-Linux/${ARCH}}" +PLATFORM="${PLATFORM-linux/${ARCH}}" INVOKEAI_BRANCH="${INVOKEAI_BRANCH-$(git branch --show)}" CONTAINER_REGISTRY="${CONTAINER_REGISTRY-"ghcr.io"}" CONTAINER_REPOSITORY="${CONTAINER_REPOSITORY-"$(whoami)/${REPOSITORY_NAME}"}"