Fix hosting issues. Consolidate compose files since we obviously need both. Need to update some variables and my readme & stuff but I'll do it later
@@ -40,11 +40,13 @@ ENV NEXT_TELEMETRY_DISABLED=1
|
||||
# non-root user
|
||||
RUN addgroup -S nodejs -g 1001 && adduser -S nextjs -u 1001
|
||||
COPY --from=builder /app/apps/next/public ./public
|
||||
RUN mkdir .next && chown -R nextjs:nodejs .next
|
||||
RUN mkdir -p .next/cache && chown -R nextjs:nodejs .next
|
||||
|
||||
# Next standalone output
|
||||
COPY --from=builder /app/apps/next/.next/standalone ./
|
||||
COPY --from=builder /app/apps/next/.next/static ./.next/static
|
||||
COPY --from=builder /app/node_modules ./node_modules
|
||||
|
||||
USER nextjs
|
||||
EXPOSE 3000
|
@@ -1,7 +1,23 @@
|
||||
networks:
|
||||
nginx-bridge: # Change this one line to match your network name in env file.
|
||||
nginx-bridge: # You need to change this line to your defined network is as well
|
||||
external: true
|
||||
|
||||
services:
|
||||
techtracker-next:
|
||||
build:
|
||||
context: ../
|
||||
dockerfile: ./docker/Dockerfile
|
||||
image: ${CONTAINER_NAME}:alpine
|
||||
container_name: ${CONTAINER_NAME}
|
||||
env_file: [.env]
|
||||
hostname: ${CONTAINER_NAME}
|
||||
domainname: ${DOMAIN_NAME}
|
||||
networks: ['${NETWORK:-nginx-bridge}']
|
||||
#ports: ['${PORT}:3000']
|
||||
depends_on: ['convex-backend']
|
||||
tty: true
|
||||
stdin_open: true
|
||||
restart: unless-stopped
|
||||
convex-backend:
|
||||
image: ghcr.io/get-convex/convex-backend:${BACKEND_TAG:-00bd92723422f3bff968230c94ccdeb8c1719832}
|
||||
container_name: ${BACKEND_CONTAINER_NAME:-convex-backend}
|
||||
@@ -31,7 +47,6 @@ services:
|
||||
start_period: 10s
|
||||
stop_grace_period: 10s
|
||||
stop_signal: SIGINT
|
||||
|
||||
convex-dashboard:
|
||||
image: ghcr.io/get-convex/convex-dashboard:${DASHBOARD_TAG:-33cef775a8a6228cbacee4a09ac2c4073d62ed13}
|
||||
container_name: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
|
||||
@@ -52,4 +67,3 @@ services:
|
||||
restart: unless-stopped
|
||||
stop_grace_period: 10s
|
||||
stop_signal: SIGINT
|
||||
|
@@ -1,49 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e # Exit immediately if a command exits with a non-zero status.
|
||||
|
||||
# --- Configuration ---
|
||||
COMPOSE_FILE="./host/convex/docker/compose.yml"
|
||||
DEFAULT_PROJECT_NAME="techtracker"
|
||||
DEV_PROJECT_NAME="dev-techtracker" # The project name for dev mode
|
||||
|
||||
COMPOSE_PROJECT_FLAG=${DEFAULT_PROJECT_NAME} # This will hold "-p dev-techtracker" if --dev is used
|
||||
|
||||
# --- Function to display usage ---
|
||||
usage() {
|
||||
echo "Usage: $0 [OPTIONS]"
|
||||
echo "Or: ./update.sh [OPTIONS]" # Assuming the script is named update.sh
|
||||
echo ""
|
||||
echo "Options:"
|
||||
echo " -d, --dev Run in development mode, using project name '${DEV_PROJECT_NAME}'."
|
||||
echo " Adds '-p ${DEV_PROJECT_NAME}' to docker compose commands."
|
||||
echo " -h, --help Display this help message."
|
||||
exit 1
|
||||
}
|
||||
|
||||
# --- Parse arguments ---
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case "$1" in
|
||||
-d|--dev)
|
||||
COMPOSE_PROJECT_FLAG=${DEV_PROJECT_NAME}
|
||||
shift # Consume the argument
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
echo "Error: Unknown argument '$1'" >&2
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# --- Main Script Logic ---
|
||||
echo "--- Pulling latest git changes ---"
|
||||
git pull
|
||||
echo "--- Building Docker Compose services ${COMPOSE_PROJECT_FLAG} ---"
|
||||
sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" build
|
||||
echo "--- Bringing down Docker Compose services ${COMPOSE_PROJECT_FLAG} ---"
|
||||
sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" down
|
||||
echo "--- Bringing up Docker Compose services ${COMPOSE_PROJECT_FLAG} in detached mode ---"
|
||||
sudo docker compose -p ${COMPOSE_PROJECT_FLAG} -f "${COMPOSE_FILE}" up -d
|
||||
echo "--- Script finished successfully ---"
|
1
host/data/credentials/instance_name
Normal file
@@ -0,0 +1 @@
|
||||
Convex.gib
|
1
host/data/credentials/instance_secret
Normal file
@@ -0,0 +1 @@
|
||||
d35a9c02aeef0070fac3069d51ac4926744b251d0e6d97dc239d78bce67959b6
|
BIN
host/data/db.sqlite3
Normal file
After Width: | Height: | Size: 1.1 MiB |
After Width: | Height: | Size: 782 KiB |
After Width: | Height: | Size: 1.1 MiB |
After Width: | Height: | Size: 148 KiB |
After Width: | Height: | Size: 782 KiB |
After Width: | Height: | Size: 992 KiB |
After Width: | Height: | Size: 1.2 MiB |
After Width: | Height: | Size: 1.9 MiB |
After Width: | Height: | Size: 6.4 KiB |
After Width: | Height: | Size: 1.4 MiB |
After Width: | Height: | Size: 3.6 MiB |
After Width: | Height: | Size: 3.4 MiB |