From 28221a4e7ac5b5faf7f95882261bc421d7a784dc Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 26 Oct 2024 19:27:01 -0600 Subject: [PATCH] refactor(dokploy): add umami and update favicon --- .github/workflows/deploy.yml | 3 ++- Dockerfile.cloud | 7 +++++++ apps/docs/app/[lang]/layout.tsx | 7 +++++++ apps/dokploy/pages/_app.tsx | 9 +++++++++ apps/dokploy/pages/_document.tsx | 5 +++-- apps/dokploy/public/favicon.ico | Bin 3494 -> 0 bytes apps/dokploy/public/logo.png | Bin 17567 -> 0 bytes apps/website/app/[locale]/layout.tsx | 11 ++++++++--- pnpm-lock.yaml | 6 +++--- 9 files changed, 39 insertions(+), 9 deletions(-) delete mode 100644 apps/dokploy/public/favicon.ico delete mode 100644 apps/dokploy/public/logo.png diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a7b60213c..73a021cc6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -74,7 +74,8 @@ jobs: platforms: linux/amd64 build-args: | NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${{ github.ref_name == 'main' && 'pk_live_51QAm7bF3cxQuHeOzMpfNfJIch6oLif8rS32pRE392CdTbBf0MYBdbapAxarQGspqJBWT2nVOxu8e6ZHrHB4NhVHG008DE2A90d' || 'pk_test_51QAm7bF3cxQuHeOz0xg04o9teeyTbbNHQPJ5Tr98MlTEan9MzewT3gwh0jSWBNvrRWZ5vASoBgxUSF4gPWsJwATk00Ir2JZ0S1' }} - + NEXT_PUBLIC_UMAMI_HOST="https://umami.dokploy.com/script.js" + NEXT_PUBLIC_UMAMI_WEBSITE_ID="ef083745-e111-4bac-9fe6-c549807adefe" build-and-push-schedule-image: runs-on: ubuntu-latest diff --git a/Dockerfile.cloud b/Dockerfile.cloud index 664180f7f..f664e1a49 100644 --- a/Dockerfile.cloud +++ b/Dockerfile.cloud @@ -14,8 +14,15 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server # Deploy only the dokploy app +ARG NEXT_PUBLIC_UMAMI_HOST +ENV NEXT_PUBLIC_UMAMI_HOST=$NEXT_PUBLIC_UMAMI_HOST + +ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID +ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID + ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY + ENV NODE_ENV=production RUN pnpm --filter=@dokploy/server switch:prod RUN pnpm --filter=@dokploy/server build diff --git a/apps/docs/app/[lang]/layout.tsx b/apps/docs/app/[lang]/layout.tsx index aa0d2c63b..d00df3074 100644 --- a/apps/docs/app/[lang]/layout.tsx +++ b/apps/docs/app/[lang]/layout.tsx @@ -63,6 +63,13 @@ export default function Layout({ className={inter.className} suppressHydrationWarning > + +