From 3060f18e800a930d0b7cde660629ec1cf00ec60c Mon Sep 17 00:00:00 2001
From: Chris Grimmett <chris@grimtech.net>
Date: Thu, 28 Mar 2024 23:45:51 -0800
Subject: [PATCH] potential fix

---
 .gitea/workflows/builder.yaml |  4 ++--
 Makefile                      |  2 +-
 compose.yml                   |  2 +-
 next.Dockerfile               | 32 --------------------------------
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 next.Dockerfile

diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml
index 5fc423f..fe31420 100644
--- a/.gitea/workflows/builder.yaml
+++ b/.gitea/workflows/builder.yaml
@@ -16,9 +16,9 @@ jobs:
         #   repository: https://gitea.futureporn.net/futureporn/fp
 
       - uses: mr-smithers-excellent/docker-build-push@v6
-        name: Build & push fp/next Docker image
+        name: Build & push next Docker image
         with:
-          image: gitea.futureporn.net/futureporn/next
+          image: futureporn/next
           tags: latest
           # which 'registry:' version do I need?
           registry: https://gitea.futureporn.net
diff --git a/Makefile b/Makefile
index 52f37be..4ed57bb 100644
--- a/Makefile
+++ b/Makefile
@@ -39,4 +39,4 @@ cluster:
 # A gitea act runner which runs locally
 # https://docs.gitea.com/next/usage/actions/overview
 runner:
-	docker run -d --rm -e GITEA_INSTANCE_URL=https://gitea.futureporn.net -e GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN} -v /var/run/docker.sock:/var/run/docker.sock --name fp-gitea-act-runner gitea/act_runner:latest
+	docker run -d --rm -e GITEA_INSTANCE_URL=https://gitea.futureporn.net -e GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN} -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/.local/share/applications/fp/act-runner-data:/data --name fp-gitea-act-runner gitea/act_runner:latest
diff --git a/compose.yml b/compose.yml
index affc3e9..63b1172 100644
--- a/compose.yml
+++ b/compose.yml
@@ -116,7 +116,7 @@ services:
     container_name: fp-next
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: next.Dockerfile
       target: dev
     restart: on-failure
     environment:
diff --git a/next.Dockerfile b/next.Dockerfile
deleted file mode 100644
index d4c2034..0000000
--- a/next.Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM node:20-slim AS base
-
-# Install dependencies only when needed
-FROM base AS deps
-RUN corepack enable
-
-
-
-FROM deps AS build
-ARG NEXT_PUBLIC_SITE_URL=https://futureporn.net
-ARG NEXT_PUBLIC_STRAPI_URL=https://portal.futureporn.net
-ARG NEXT_PUBLIC_UPPY_COMPANION_URL=https://uppy.futureporn.net
-ENV NEXT_PUBLIC_SITE_URL ${NEXT_PUBLIC_SITE_URL}
-ENV NEXT_PUBLIC_STRAPI_URL ${NEXT_PUBLIC_STRAPI_URL}
-ENV NEXT_PUBLIC_UPPY_COMPANION_URL ${NEXT_PUBLIC_UPPY_COMPANION_URL}
-WORKDIR /usr/src/app
-COPY . .
-ENV NEXT_TELEMETRY_DISABLED 1
-RUN --mount=type=cache,id=pnpm-store,target=/root/.pnpm-store pnpm install
-RUN pnpm run -r build
-RUN pnpm deploy --filter=fp-next /app
-
-
-FROM deps AS dev
-WORKDIR /app
-COPY --from=build /usr/src/app /app
-CMD ["pnpm", "run", "dev"]
-
-FROM deps AS next
-WORKDIR /app
-COPY --from=build /app /app
-CMD ["pnpm", "start"]
\ No newline at end of file