From a9ef5d15320879fcec9748025929df27d679fe40 Mon Sep 17 00:00:00 2001 From: mauwii Date: Sun, 5 Feb 2023 22:59:06 +0100 Subject: [PATCH 1/4] update tags --- .github/workflows/build-container.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 41f7fc1a49..bba787ee9f 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -3,6 +3,7 @@ on: push: branches: - 'main' + - 'update/ci/*' tags: - 'v*.*.*' @@ -42,13 +43,12 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} images: ghcr.io/${{ github.repository }} tags: | - type=ref,event=branch + type=ref,event=branch,suffix=-${{ matrix.flavor }} type=ref,event=tag type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} - type=sha,enable=true,prefix=sha-,suffix=${{ matrix.flavor}},format=short - type=raw,value={{branch}}-${{ matrix.flavor }} + type=sha,enable=true,prefix=sha-,suffix=-${{ matrix.flavor}},format=short flavor: | latest=${{ matrix.flavor == 'cuda' && github.ref == 'refs/heads/main' }} From 0402766f4d1edfec9f3652a9a7fff3b566a72e68 Mon Sep 17 00:00:00 2001 From: mauwii Date: Mon, 6 Feb 2023 00:10:37 +0100 Subject: [PATCH 2/4] add author label --- docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a3e54d22df..d957e72334 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,4 @@ # syntax=docker/dockerfile:1 - -# Maintained by Matthias Wild - ARG PYTHON_VERSION=3.9 ################## ## base image ## @@ -85,3 +82,5 @@ ENV INVOKE_MODEL_RECONFIGURE="--yes --default_only" ENTRYPOINT [ "invokeai" ] CMD [ "--web", "--host=0.0.0.0" ] VOLUME [ "/data" ] + +LABEL org.opencontainers.image.authors="mauwii@outlook.de" From 1c9fd00f98731b435f79e7fec01f51c7212625a7 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 6 Feb 2023 12:03:08 -0500 Subject: [PATCH 3/4] this is likely the penultimate rc --- installer/create_installer.sh | 0 ldm/invoke/_version.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 installer/create_installer.sh diff --git a/installer/create_installer.sh b/installer/create_installer.sh old mode 100644 new mode 100755 diff --git a/ldm/invoke/_version.py b/ldm/invoke/_version.py index 3ea081283c..2d03f9cec4 100644 --- a/ldm/invoke/_version.py +++ b/ldm/invoke/_version.py @@ -1 +1 @@ -__version__='2.3.0-rc4' +__version__='2.3.0-rc5' From 8242fc8bad2887dc59e2f5f3e994aa347680dd45 Mon Sep 17 00:00:00 2001 From: mauwii Date: Mon, 6 Feb 2023 19:58:48 +0100 Subject: [PATCH 4/4] update metadata --- .github/workflows/build-container.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index bba787ee9f..b340768dd2 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -43,15 +43,15 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} images: ghcr.io/${{ github.repository }} tags: | - type=ref,event=branch,suffix=-${{ matrix.flavor }} + type=ref,event=branch type=ref,event=tag type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} - type=sha,enable=true,prefix=sha-,suffix=-${{ matrix.flavor}},format=short + type=sha,enable=true,prefix=sha-,format=short flavor: | latest=${{ matrix.flavor == 'cuda' && github.ref == 'refs/heads/main' }} - + suffix=-${{ matrix.flavor }},onlatest=false - name: Set up QEMU uses: docker/setup-qemu-action@v2