From 9c81d0c1edba434caff433d0b0321464cd381ab2 Mon Sep 17 00:00:00 2001 From: Prashant Varma Date: Thu, 19 Jun 2025 11:27:41 +0530 Subject: [PATCH] clean up --- .github/workflows/deploy.yml | 2 +- start-database.sh | 83 ------------------------------------ 2 files changed, 1 insertion(+), 84 deletions(-) delete mode 100755 start-database.sh diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 12261b2..8b351d3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,7 +27,7 @@ jobs: uses: docker/build-push-action@v4 with: context: . - file: ./docker/Dockerfile.frontend + file: ./Dockerfile build-args: - DATABASE_URL=${{ secrets.DATABASE_URL }} push: true diff --git a/start-database.sh b/start-database.sh deleted file mode 100755 index c30b549..0000000 --- a/start-database.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash -# Use this script to start a docker container for a local development database - -# TO RUN ON WINDOWS: -# 1. Install WSL (Windows Subsystem for Linux) - https://learn.microsoft.com/en-us/windows/wsl/install -# 2. Install Docker Desktop or Podman Deskop -# - Docker Desktop for Windows - https://docs.docker.com/docker-for-windows/install/ -# - Podman Desktop - https://podman.io/getting-started/installation -# 3. Open WSL - `wsl` -# 4. Run this script - `./start-database.sh` - -# On Linux and macOS you can run this script directly - `./start-database.sh` - -# import env variables from .env -set -a -source .env - -DB_PASSWORD=$(echo "$DATABASE_URL" | awk -F':' '{print $3}' | awk -F'@' '{print $1}') -DB_PORT=$(echo "$DATABASE_URL" | awk -F':' '{print $4}' | awk -F'\/' '{print $1}') -DB_NAME=$(echo "$DATABASE_URL" | awk -F'/' '{print $4}') -DB_CONTAINER_NAME="$DB_NAME-postgres" - -if ! [ -x "$(command -v docker)" ] && ! [ -x "$(command -v podman)" ]; then - echo -e "Docker or Podman is not installed. Please install docker or podman and try again.\nDocker install guide: https://docs.docker.com/engine/install/\nPodman install guide: https://podman.io/getting-started/installation" - exit 1 -fi - -# determine which docker command to use -if [ -x "$(command -v docker)" ]; then - DOCKER_CMD="docker" -elif [ -x "$(command -v podman)" ]; then - DOCKER_CMD="podman" -fi - -if ! $DOCKER_CMD info > /dev/null 2>&1; then - echo "$DOCKER_CMD daemon is not running. Please start $DOCKER_CMD and try again." - exit 1 -fi - -if command -v nc >/dev/null 2>&1; then - if nc -z localhost "$DB_PORT" 2>/dev/null; then - echo "Port $DB_PORT is already in use." - exit 1 - fi -else - echo "Warning: Unable to check if port $DB_PORT is already in use (netcat not installed)" - read -p "Do you want to continue anyway? [y/N]: " -r REPLY - if ! [[ $REPLY =~ ^[Yy]$ ]]; then - echo "Aborting." - exit 1 - fi -fi - -if [ "$($DOCKER_CMD ps -q -f name=$DB_CONTAINER_NAME)" ]; then - echo "Database container '$DB_CONTAINER_NAME' already running" - exit 0 -fi - -if [ "$($DOCKER_CMD ps -q -a -f name=$DB_CONTAINER_NAME)" ]; then - $DOCKER_CMD start "$DB_CONTAINER_NAME" - echo "Existing database container '$DB_CONTAINER_NAME' started" - exit 0 -fi - -if [ "$DB_PASSWORD" = "password" ]; then - echo "You are using the default database password" - read -p "Should we generate a random password for you? [y/N]: " -r REPLY - if ! [[ $REPLY =~ ^[Yy]$ ]]; then - echo "Please change the default password in the .env file and try again" - exit 1 - fi - # Generate a random URL-safe password - DB_PASSWORD=$(openssl rand -base64 12 | tr '+/' '-_') - sed -i '' "s#:password@#:$DB_PASSWORD@#" .env -fi - -$DOCKER_CMD run -d \ - --name $DB_CONTAINER_NAME \ - -e POSTGRES_USER="postgres" \ - -e POSTGRES_PASSWORD="$DB_PASSWORD" \ - -e POSTGRES_DB="$DB_NAME" \ - -p "$DB_PORT":5432 \ - docker.io/postgres && echo "Database container '$DB_CONTAINER_NAME' was successfully created"