From 4ece851bf7d771c1106a966ccc456fc5f2ec288f Mon Sep 17 00:00:00 2001 From: tonymtz Date: Sat, 9 Nov 2024 17:15:42 -0700 Subject: [PATCH] updates gh-actions --- .github/workflows/main.yml | 21 ++++----------------- Dockerfile | 16 ++++------------ package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 11 insertions(+), 32 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f7f124..d526abc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,15 +12,15 @@ jobs: steps: # Checkout the repo - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Setup Docker Buildx - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 # Build and push Docker Image - name: Login to Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -36,21 +36,8 @@ jobs: file: ./Dockerfile push: true tags: ${{ env.IMAGE_URL }} - secrets: | - SUPABASE_SERVICE_ROLE_KEY=${{ secrets.SUPABASE_SERVICE_ROLE_KEY }} - STRIPE_SECRET_KEY=${{ secrets.STRIPE_SECRET_KEY }} - STRIPE_WEBHOOK_SECRET=${{ secrets.STRIPE_WEBHOOK_SECRET }} build-args: | - SUPABASE_SERVICE_ROLE_KEY=${{ secrets.SUPABASE_SERVICE_ROLE_KEY }} - NEXT_PUBLIC_POSTHOG_KEY=${{ vars.NEXT_PUBLIC_POSTHOG_KEY }} - NEXT_PUBLIC_POSTHOG_HOST=${{ vars.NEXT_PUBLIC_POSTHOG_HOST }} - NEXT_PUBLIC_SENTRY_DSN=${{ vars.NEXT_PUBLIC_SENTRY_DSN }} - NEXT_PUBLIC_CMS_API_KEY=${{ secrets.NEXT_PUBLIC_CMS_API_KEY }} - SENTRY_DSN=${{ vars.SENTRY_DSN }} - NEXT_PUBLIC_SITE_URL=${{ secrets.NEXT_PUBLIC_SITE_URL }} - NEXT_PUBLIC_SUPABASE_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_URL }} - NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }} - NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${{ secrets.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY }} + DOPPLER_TOKEN=${{ secrets.DOPPLER_TOKEN }} # Deploy to CapRover - name: Deploy Image to CapRover diff --git a/Dockerfile b/Dockerfile index ba8f779..782cac7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,9 @@ FROM node:18-alpine AS deps RUN apk add --no-cache libc6-compat +RUN wget -q -t3 'https://packages.doppler.com/public/cli/rsa.8004D9FF50437357.key' -O /etc/apk/keys/cli@doppler-8004D9FF50437357.rsa.pub && \ + echo 'https://packages.doppler.com/public/cli/alpine/any-version/main' | tee -a /etc/apk/repositories && \ + apk add doppler + WORKDIR /app COPY package.json package-lock.json ./ @@ -11,18 +15,6 @@ COPY --from=deps /app/node_modules ./node_modules COPY . . ENV NEXT_TELEMETRY_DISABLED 1 -ARG NEXT_PUBLIC_POSTHOG_KEY=$NEXT_PUBLIC_POSTHOG_KEY -ARG NEXT_PUBLIC_POSTHOG_HOST=$NEXT_PUBLIC_POSTHOG_HOST -ARG NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN -ARG NEXT_PUBLIC_CMS_API_KEY=$NEXT_PUBLIC_CMS_API_KEY -ARG SENTRY_DSN=$SENTRY_DSN -ARG NEXT_PUBLIC_SITE_URL=$NEXT_PUBLIC_SITE_URL -ARG NEXT_PUBLIC_SUPABASE_URL=$NEXT_PUBLIC_SUPABASE_URL -ARG NEXT_PUBLIC_SUPABASE_ANON_KEY=$NEXT_PUBLIC_SUPABASE_ANON_KEY -ARG SUPABASE_SERVICE_ROLE_KEY=$SUPABASE_SERVICE_ROLE_KEY -ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY -ARG STRIPE_SECRET_KEY=$STRIPE_SECRET_KEY -ARG STRIPE_WEBHOOK_SECRET=$STRIPE_WEBHOOK_SECRET RUN npm run build diff --git a/package-lock.json b/package-lock.json index 0bcfe64..7b5eea3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tomatoro", - "version": "3.0.231", + "version": "3.0.232", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tomatoro", - "version": "3.0.231", + "version": "3.0.232", "dependencies": { "@radix-ui/react-toast": "^1.1.5", "@sentry/nextjs": "^8.37.1", diff --git a/package.json b/package.json index 97b84f0..0e9b831 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tomatoro", - "version": "3.0.231", + "version": "3.0.232", "private": true, "scripts": { "dev": "next dev --turbo",