diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 74df148511..b979196cc1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # continuous integration -/.github/workflows/ @lstein @blessedcoolant @hipsterusername +/.github/workflows/ @lstein @blessedcoolant @hipsterusername @ebr # documentation /docs/ @lstein @blessedcoolant @hipsterusername @Millu @@ -10,7 +10,7 @@ # installation and configuration /pyproject.toml @lstein @blessedcoolant @hipsterusername -/docker/ @lstein @blessedcoolant @hipsterusername +/docker/ @lstein @blessedcoolant @hipsterusername @ebr /scripts/ @ebr @lstein @hipsterusername /installer/ @lstein @ebr @hipsterusername /invokeai/assets @lstein @ebr @hipsterusername @@ -26,9 +26,7 @@ # front ends /invokeai/frontend/CLI @lstein @hipsterusername -/invokeai/frontend/install @lstein @ebr @hipsterusername +/invokeai/frontend/install @lstein @ebr @hipsterusername /invokeai/frontend/merge @lstein @blessedcoolant @hipsterusername /invokeai/frontend/training @lstein @blessedcoolant @hipsterusername /invokeai/frontend/web @psychedelicious @blessedcoolant @maryhipp @hipsterusername - - diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 60eba4a297..74fcc02ab3 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -40,10 +40,14 @@ jobs: - name: Free up more disk space on the runner # https://github.com/actions/runner-images/issues/2840#issuecomment-1284059930 run: | + echo "----- Free space before cleanup" + df -h sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo swapoff /mnt/swapfile sudo rm -rf /mnt/swapfile + echo "----- Free space after cleanup" + df -h - name: Checkout uses: actions/checkout@v3 @@ -91,6 +95,7 @@ jobs: # password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build container + timeout-minutes: 40 id: docker_build uses: docker/build-push-action@v4 with: diff --git a/docker/Dockerfile b/docker/Dockerfile index 6626907999..c89a5773f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -59,7 +59,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ # #### Build the Web UI ------------------------------------ -FROM node:18-slim AS web-builder +FROM node:20-slim AS web-builder ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable @@ -68,7 +68,7 @@ WORKDIR /build COPY invokeai/frontend/web/ ./ RUN --mount=type=cache,target=/pnpm/store \ pnpm install --frozen-lockfile -RUN pnpm run build +RUN npx vite build #### Runtime stage --------------------------------------- diff --git a/invokeai/frontend/web/.gitignore b/invokeai/frontend/web/.gitignore index 402095f4be..8e7ebc76a1 100644 --- a/invokeai/frontend/web/.gitignore +++ b/invokeai/frontend/web/.gitignore @@ -8,6 +8,7 @@ pnpm-debug.log* lerna-debug.log* node_modules +.pnpm-store # We want to distribute the repo dist dist/**