Merge remote-tracking branch 'refs/remotes/origin/main'

.github/workflows/docker.yml

@@ -0,0 +1,52 @@
+name: Build and push inpaint-web Docker image
+
+on:
+  workflow_dispatch:
+  push:
+    branches: ["main"]
+
+jobs:
+  build-docs-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ${{ secrets.DOCKER_USERNAME }}/inpaint-web
+            ghcr.io/${{ github.repository_owner }}/inpaint-web
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to ghcr.io
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GH_PAT }}
+
+      - name: Build and push Docker images to ghcr.io and Docker Hub
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -0,0 +1,17 @@
+FROM node:18 as builder
+
+WORKDIR /usr/src/app
+
+# Copy the package.json and package-lock.json files over
+# We do this FIRST so that we don't copy the huge node_modules folder over from our local machine
+# The node_modules can contain machine-specific libraries, so it should be created by the machine that's actually running the code
+COPY . ./
+
+# Now we run NPM install, which includes dev dependencies
+RUN npm install
+
+FROM alpine:latest as production
+RUN apk --no-cache add nodejs ca-certificates
+WORKDIR /root/
+COPY --from=builder /usr/src/app ./
+CMD [ "node", "node_modules/vite/bin/vite.js", "--host" ]

src/Editor.tsx

@@ -103,7 +103,7 @@ export default function Editor(props: EditorProps) {
       throw new Error('could not retrieve mask canvas')
     }
     // Just need the finishing touch
-    const line = lines.at(-1)
+    const line = lines.slice(-1)[0]
     if (line) drawLines(ctx, [line], 'white')
   }, [context?.canvas.height, context?.canvas.width, lines, maskCanvas])
 
@@ -155,7 +155,7 @@ export default function Editor(props: EditorProps) {
       if (!original.src || showOriginal) {
         return
       }
-      if (lines.at(-1)?.pts.length === 0) {
+      if (lines.slice(-1)[0]?.pts.length === 0) {
         return
       }
       setIsInpaintingLoading(true)
@@ -177,7 +177,7 @@ export default function Editor(props: EditorProps) {
         const start = Date.now()
         console.log('inpaint_start')
         // each time based on the last result, the first is the original
-        const newFile = renders.at(-1) ?? file
+        const newFile = renders.slice(-1)[0] ?? file
         const res = await inpaint(newFile, maskCanvas.toDataURL())
         if (!res) {
           throw new Error('empty response')