wipe out old repo & replace with template
This commit is contained in:
53
scripts/docker/development/Dockerfile
Normal file
53
scripts/docker/development/Dockerfile
Normal file
@ -0,0 +1,53 @@
|
||||
# syntax=docker.io/docker/dockerfile:1
|
||||
|
||||
FROM node:18-alpine AS base
|
||||
|
||||
# 1. Install dependencies only when needed
|
||||
FROM base AS deps
|
||||
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
|
||||
RUN apk add --no-cache libc6-compat
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install dependencies based on the preferred package manager
|
||||
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./
|
||||
RUN \
|
||||
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
|
||||
elif [ -f package-lock.json ]; then npm ci; \
|
||||
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i; \
|
||||
else echo "Lockfile not found." && exit 1; \
|
||||
fi
|
||||
|
||||
# 2. Rebuild the source code only when needed
|
||||
FROM base AS builder
|
||||
WORKDIR /app
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
# This will do the trick, use the corresponding env file for each environment.
|
||||
COPY .env .env.production
|
||||
RUN npm run build
|
||||
|
||||
# 3. Production image, copy all the files and run next
|
||||
FROM base AS runner
|
||||
WORKDIR /app
|
||||
|
||||
ENV NODE_ENV=production
|
||||
|
||||
RUN addgroup -g 1001 -S nodejs
|
||||
RUN adduser -S nextjs -u 1001
|
||||
|
||||
COPY --from=builder /app/public ./public
|
||||
|
||||
# Automatically leverage output traces to reduce image size
|
||||
# https://nextjs.org/docs/advanced-features/output-file-tracing
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||
|
||||
|
||||
USER nextjs
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
ENV PORT=3000
|
||||
|
||||
CMD HOSTNAME="0.0.0.0" node server.js
|
||||
16
scripts/docker/development/compose.yaml
Normal file
16
scripts/docker/development/compose.yaml
Normal file
@ -0,0 +1,16 @@
|
||||
services:
|
||||
t3-template:
|
||||
build:
|
||||
context: ../../../
|
||||
dockerfile: docker/development/Dockerfile
|
||||
image: with-docker-multi-env-development
|
||||
container_name: t3-template
|
||||
networks:
|
||||
- nginx-bridge
|
||||
#ports:
|
||||
#- '3000:3000'
|
||||
tty: true
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
nginx-bridge:
|
||||
external: true
|
||||
54
scripts/docker/production/Dockerfile
Normal file
54
scripts/docker/production/Dockerfile
Normal file
@ -0,0 +1,54 @@
|
||||
# syntax=docker.io/docker/dockerfile:1
|
||||
|
||||
FROM node:18-alpine AS base
|
||||
|
||||
# 1. Install dependencies only when needed
|
||||
FROM base AS deps
|
||||
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
|
||||
RUN apk add --no-cache libc6-compat
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install dependencies based on the preferred package manager
|
||||
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./
|
||||
RUN \
|
||||
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
|
||||
elif [ -f package-lock.json ]; then npm ci; \
|
||||
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i; \
|
||||
else echo "Lockfile not found." && exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
# 2. Rebuild the source code only when needed
|
||||
FROM base AS builder
|
||||
WORKDIR /app
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
# This will do the trick, use the corresponding env file for each environment.
|
||||
COPY .env .env.production
|
||||
RUN npm run build
|
||||
|
||||
# 3. Production image, copy all the files and run next
|
||||
FROM base AS runner
|
||||
WORKDIR /app
|
||||
|
||||
ENV NODE_ENV=production
|
||||
|
||||
RUN addgroup -g 1001 -S nodejs
|
||||
RUN adduser -S nextjs -u 1001
|
||||
|
||||
COPY --from=builder /app/public ./public
|
||||
|
||||
# Automatically leverage output traces to reduce image size
|
||||
# https://nextjs.org/docs/advanced-features/output-file-tracing
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||
|
||||
|
||||
USER nextjs
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
ENV PORT=3000
|
||||
|
||||
CMD HOSTNAME="0.0.0.0" node server.js
|
||||
16
scripts/docker/production/compose.yaml
Normal file
16
scripts/docker/production/compose.yaml
Normal file
@ -0,0 +1,16 @@
|
||||
services:
|
||||
t3-template:
|
||||
build:
|
||||
context: ../../../
|
||||
dockerfile: docker/production/Dockerfile
|
||||
image: with-docker-multi-env-development
|
||||
container_name: t3-template
|
||||
networks:
|
||||
- nginx-bridge
|
||||
#ports:
|
||||
#- '3000:3000'
|
||||
tty: true
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
nginx-bridge:
|
||||
external: true
|
||||
@ -81,12 +81,6 @@ def main():
|
||||
|
||||
markdown_text = '\n'.join(markdown_lines)
|
||||
|
||||
# Write markdown to file
|
||||
output_file = 'output.md'
|
||||
with open(output_file, 'w', encoding='utf-8') as f:
|
||||
f.write(markdown_text)
|
||||
print(f"\nMarkdown file '{output_file}' has been generated.")
|
||||
|
||||
# Copy markdown content to clipboard
|
||||
pyperclip.copy(markdown_text)
|
||||
print("Markdown content has been copied to the clipboard.")
|
||||
133
scripts/generate_types
Executable file
133
scripts/generate_types
Executable file
@ -0,0 +1,133 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Define colors for better output
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
RED='\033[0;31m'
|
||||
BLUE='\033[0;34m'
|
||||
BOLD='\033[1m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
# Get the project root directory (one level up from scripts/)
|
||||
PROJECT_ROOT="$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")"
|
||||
|
||||
# Clear the screen for better visibility
|
||||
clear
|
||||
|
||||
echo -e "${BOLD}${BLUE}===== Supabase TypeScript Type Generator =====${NC}"
|
||||
echo
|
||||
echo -e "${YELLOW}⚠️ IMPORTANT: This script must be run on the server hosting the Supabase Docker container.${NC}"
|
||||
echo -e "It will not work if you're running it from a different machine, even if connected via VPN."
|
||||
echo
|
||||
echo -e "Project root: ${BLUE}${PROJECT_ROOT}${NC}"
|
||||
echo
|
||||
|
||||
# Ask for confirmation
|
||||
read -p "Are you running this script on the Supabase host server? (y/n) " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo -e "${RED}Aborted. Please run this script on the server hosting Supabase.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check for sudo access
|
||||
if ! sudo -v; then
|
||||
echo -e "${RED}Error: This script requires sudo privileges.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if .env file exists in project root
|
||||
ENV_FILE="${PROJECT_ROOT}/.env"
|
||||
if [ ! -f "$ENV_FILE" ]; then
|
||||
echo -e "${RED}Error: .env file not found at ${ENV_FILE}${NC}"
|
||||
echo -e "Please create a .env file with the following variables:"
|
||||
echo -e "SUPABASE_DB_HOST, SUPABASE_DB_PORT, SUPABASE_DB_USER, SUPABASE_DB_PASSWORD, SUPABASE_DB_NAME"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}Found .env file at $ENV_FILE${NC}"
|
||||
|
||||
# Source the .env file to get environment variables
|
||||
export $(grep -v '^#' $ENV_FILE | xargs)
|
||||
|
||||
# Check if required variables are set
|
||||
if [ -z "$SUPABASE_DB_HOST" ] || [ -z "$SUPABASE_DB_PORT" ] || [ -z "$SUPABASE_DB_USER" ] || [ -z "$SUPABASE_DB_PASSWORD" ] || [ -z "$SUPABASE_DB_NAME" ]; then
|
||||
# Try to use default variables if Supabase-specific ones aren't set
|
||||
if [ -z "$SUPABASE_DB_HOST" ]; then SUPABASE_DB_HOST=${DB_HOST:-localhost}; fi
|
||||
if [ -z "$SUPABASE_DB_PORT" ]; then SUPABASE_DB_PORT=${DB_PORT:-5432}; fi
|
||||
if [ -z "$SUPABASE_DB_USER" ]; then SUPABASE_DB_USER=${DB_USER:-postgres}; fi
|
||||
if [ -z "$SUPABASE_DB_PASSWORD" ]; then SUPABASE_DB_PASSWORD=${DB_PASSWORD}; fi
|
||||
if [ -z "$SUPABASE_DB_NAME" ]; then SUPABASE_DB_NAME=${DB_NAME:-postgres}; fi
|
||||
|
||||
# Check again after trying defaults
|
||||
if [ -z "$SUPABASE_DB_HOST" ] || [ -z "$SUPABASE_DB_PORT" ] || [ -z "$SUPABASE_DB_USER" ] || [ -z "$SUPABASE_DB_PASSWORD" ] || [ -z "$SUPABASE_DB_NAME" ]; then
|
||||
echo -e "${RED}Error: Missing required environment variables${NC}"
|
||||
echo -e "Please ensure your .env file contains:"
|
||||
echo -e "SUPABASE_DB_HOST, SUPABASE_DB_PORT, SUPABASE_DB_USER, SUPABASE_DB_PASSWORD, SUPABASE_DB_NAME"
|
||||
echo -e "Or the equivalent DB_* variables"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if supabase CLI is installed for the sudo user
|
||||
echo -e "${YELLOW}Checking if Supabase CLI is installed...${NC}"
|
||||
if ! sudo npx supabase --version &>/dev/null; then
|
||||
echo -e "${YELLOW}Supabase CLI not found. Installing...${NC}"
|
||||
sudo npm install -g supabase
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e "${RED}Failed to install Supabase CLI. Please install it manually:${NC}"
|
||||
echo -e "sudo npm install -g supabase"
|
||||
exit 1
|
||||
fi
|
||||
echo -e "${GREEN}Supabase CLI installed successfully.${NC}"
|
||||
else
|
||||
echo -e "${GREEN}Supabase CLI is already installed.${NC}"
|
||||
fi
|
||||
|
||||
echo -e "${YELLOW}Generating Supabase TypeScript types...${NC}"
|
||||
|
||||
# Construct the database URL from environment variables
|
||||
DB_URL="postgres://$SUPABASE_DB_USER:$SUPABASE_DB_PASSWORD@$SUPABASE_DB_HOST:$SUPABASE_DB_PORT/$SUPABASE_DB_NAME"
|
||||
|
||||
# Determine the output directory (relative to project root)
|
||||
OUTPUT_DIR="${PROJECT_ROOT}/utils/supabase"
|
||||
if [ ! -d "$OUTPUT_DIR" ]; then
|
||||
echo -e "${YELLOW}Output directory $OUTPUT_DIR not found. Creating...${NC}"
|
||||
mkdir -p "$OUTPUT_DIR"
|
||||
fi
|
||||
|
||||
# Create a temporary file for the output
|
||||
TEMP_FILE=$(mktemp)
|
||||
|
||||
# Run the Supabase CLI command with sudo
|
||||
echo -e "${YELLOW}Running Supabase CLI to generate types...${NC}"
|
||||
sudo -E npx supabase gen types typescript \
|
||||
--db-url "$DB_URL" \
|
||||
--schema public > "$TEMP_FILE" 2>&1
|
||||
|
||||
# Check if the command was successful
|
||||
if [ $? -eq 0 ] && [ -s "$TEMP_FILE" ] && ! grep -q "Error" "$TEMP_FILE"; then
|
||||
# Move the temp file to the final destination
|
||||
mv "$TEMP_FILE" "$OUTPUT_DIR/types.ts"
|
||||
echo -e "${GREEN}✓ TypeScript types successfully generated at $OUTPUT_DIR/types.ts${NC}"
|
||||
|
||||
# Show the first few lines to confirm it looks right
|
||||
echo -e "${YELLOW}Preview of generated types:${NC}"
|
||||
head -n 10 "$OUTPUT_DIR/types.ts"
|
||||
echo -e "${YELLOW}...${NC}"
|
||||
else
|
||||
echo -e "${RED}✗ Failed to generate TypeScript types${NC}"
|
||||
echo -e "${RED}Error output:${NC}"
|
||||
cat "$TEMP_FILE"
|
||||
rm "$TEMP_FILE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Clear sensitive environment variables
|
||||
unset SUPABASE_DB_PASSWORD
|
||||
unset DB_URL
|
||||
|
||||
echo -e "${GREEN}${BOLD}Type generation complete!${NC}"
|
||||
echo -e "You can now use these types in your Next.js application."
|
||||
echo -e "Import them with: ${BLUE}import { Database } from '@/utils/supabase/types'${NC}"
|
||||
@ -3,16 +3,65 @@
|
||||
* for Docker builds.
|
||||
*/
|
||||
import './src/env.js';
|
||||
import { withSentryConfig } from '@sentry/nextjs';
|
||||
|
||||
/** @type {import("next").NextConfig} */
|
||||
const config = {
|
||||
output: 'standalone',
|
||||
images: {
|
||||
remotePatterns: [
|
||||
{
|
||||
protocol: 'https',
|
||||
hostname: '*.gbrown.org',
|
||||
},
|
||||
],
|
||||
},
|
||||
serverExternalPackages: ['require-in-the-middle'],
|
||||
experimental: {
|
||||
serverActions: {
|
||||
bodySizeLimit: '10mb',
|
||||
},
|
||||
},
|
||||
typescript: {
|
||||
ignoreBuildErrors: true,
|
||||
},
|
||||
eslint: {
|
||||
ignoreDuringBuilds: true,
|
||||
},
|
||||
//turbopack: {
|
||||
//rules: {
|
||||
//'*.svg': {
|
||||
//loaders: ['@svgr/webpack'],
|
||||
//as: '*.js',
|
||||
//},
|
||||
//},
|
||||
//},
|
||||
};
|
||||
|
||||
export default config;
|
||||
const sentryConfig = {
|
||||
// For all available options, see:
|
||||
// https://www.npmjs.com/package/@sentry/webpack-plugin#options
|
||||
org: 'gib',
|
||||
project: 't3-supabase-template',
|
||||
sentryUrl: process.env.SENTRY_URL,
|
||||
authToken: process.env.SENTRY_AUTH_TOKEN,
|
||||
// Only print logs for uploading source maps in CI
|
||||
silent: !process.env.CI,
|
||||
// For all available options, see:
|
||||
// https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
|
||||
// Upload a larger set of source maps for prettier stack traces (increases build time)
|
||||
widenClientFileUpload: true,
|
||||
// Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
|
||||
// This can increase your server load as well as your hosting bill.
|
||||
// Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
|
||||
// side errors will fail.
|
||||
tunnelRoute: '/monitoring',
|
||||
// Automatically tree-shake Sentry logger statements to reduce bundle size
|
||||
disableLogger: true,
|
||||
// Capture React Component Names
|
||||
reactComponentAnnotation: {
|
||||
enabled: true,
|
||||
},
|
||||
};
|
||||
|
||||
export default withSentryConfig(config, sentryConfig);
|
||||
|
||||
@ -3,47 +3,59 @@
|
||||
* for Docker builds.
|
||||
*/
|
||||
import './src/env.js';
|
||||
import { withSentryConfig } from '@sentry/nextjs';
|
||||
|
||||
/** @type {import("next").NextConfig} */
|
||||
const config = {
|
||||
output: 'standalone',
|
||||
images: {
|
||||
remotePatterns: [
|
||||
{
|
||||
protocol: 'https',
|
||||
hostname: '*.gbrown.org',
|
||||
},
|
||||
],
|
||||
},
|
||||
serverExternalPackages: ['require-in-the-middle'],
|
||||
experimental: {
|
||||
serverActions: {
|
||||
bodySizeLimit: '10mb',
|
||||
},
|
||||
},
|
||||
//turbopack: {
|
||||
//rules: {
|
||||
//'*.svg': {
|
||||
//loaders: ['@svgr/webpack'],
|
||||
//as: '*.js',
|
||||
//},
|
||||
//},
|
||||
//},
|
||||
};
|
||||
|
||||
export default config;
|
||||
/**
|
||||
* Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially useful
|
||||
* for Docker builds.
|
||||
*/
|
||||
//await import("./src/env.js");
|
||||
const sentryConfig = {
|
||||
// For all available options, see:
|
||||
// https://www.npmjs.com/package/@sentry/webpack-plugin#options
|
||||
org: 'gib',
|
||||
project: 't3-supabase-template',
|
||||
sentryUrl: process.env.SENTRY_URL,
|
||||
authToken: process.env.SENTRY_AUTH_TOKEN,
|
||||
// Only print logs for uploading source maps in CI
|
||||
silent: !process.env.CI,
|
||||
// For all available options, see:
|
||||
// https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
|
||||
// Upload a larger set of source maps for prettier stack traces (increases build time)
|
||||
widenClientFileUpload: true,
|
||||
// Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
|
||||
// This can increase your server load as well as your hosting bill.
|
||||
// Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
|
||||
// side errors will fail.
|
||||
tunnelRoute: '/monitoring',
|
||||
// Automatically tree-shake Sentry logger statements to reduce bundle size
|
||||
disableLogger: true,
|
||||
// Capture React Component Names
|
||||
reactComponentAnnotation: {
|
||||
enabled: true,
|
||||
},
|
||||
};
|
||||
|
||||
//const cspHeader = `
|
||||
//default-src 'self';
|
||||
//script-src 'self' 'unsafe-eval' 'unsafe-inline';
|
||||
//style-src 'self' 'unsafe-inline';
|
||||
//img-src 'self' blob: data:;
|
||||
//font-src 'self';
|
||||
//object-src 'none';
|
||||
//base-uri 'self';
|
||||
//form-action 'self';
|
||||
//frame-ancestors 'none';
|
||||
//upgrade-insecure-requests;
|
||||
//`
|
||||
|
||||
//[>* @type {import("next").NextConfig} <]
|
||||
//const config = {
|
||||
//async headers() {
|
||||
//return [
|
||||
//{
|
||||
//source: "/(.*)",
|
||||
//headers: [
|
||||
//{
|
||||
//key: "Content-Security-Policy",
|
||||
//value: cspHeader.replace(/\n/g, ''),
|
||||
//},
|
||||
//],
|
||||
//},
|
||||
//];
|
||||
//},
|
||||
//};
|
||||
|
||||
//export default config;
|
||||
export default withSentryConfig(config, sentryConfig);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
git pull
|
||||
mv ~/Documents/Web/Tech_Tracker_Web/next.config.js ~/Documents/Web/Tech_Tracker_Web/scripts/next.config.default.js
|
||||
cp ~/Documents/Web/Tech_Tracker_Web/scripts/next.config.build.js ~/Documents/Web/Tech_Tracker_Web/next.config.js
|
||||
sudo docker compose -f docker/development/compose.yaml down
|
||||
sudo docker compose -f docker/development/compose.yaml build
|
||||
sudo docker compose -f docker/development/compose.yaml up -d
|
||||
cp ~/Documents/Web/Tech_Tracker_Web/scripts/next.config.default.js ~/Documents/Web/Tech_Tracker_Web/next.config.js
|
||||
mv ./next.config.js ./scripts/next.config.default.js
|
||||
cp ./scripts/next.config.build.js ./next.config.js
|
||||
sudo docker compose -f ./scripts/docker/development/compose.yaml down
|
||||
sudo docker compose -f ./scripts/docker/development/compose.yaml build
|
||||
sudo docker compose -f ./scripts/docker/development/compose.yaml up -d
|
||||
cp ./scripts/next.config.default.js ./next.config.js
|
||||
|
||||
Reference in New Issue
Block a user