From 633032ee3267182ad2195102507db117a81034c6 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 25 Apr 2025 01:49:20 +0200 Subject: [PATCH] more updates --- SIMPLE-SETUP.md | 4 ++-- docker-compose.yml | 2 +- setup.sh | 16 ++-------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/SIMPLE-SETUP.md b/SIMPLE-SETUP.md index 485efd0..cb6f99e 100644 --- a/SIMPLE-SETUP.md +++ b/SIMPLE-SETUP.md @@ -18,7 +18,7 @@ docker-compose up -d ``` This will: -- Pull the calculator image from Gitea registry +- Build the calculator image from the local Dockerfile - Start the container - Make the calculator available at http://localhost:8080 @@ -46,7 +46,7 @@ version: '3.8' services: puffin-calculator: - image: code.letsbe.solutions/matt/puffinoffsetcalculator:latest + build: . container_name: puffin-calculator ports: - "8080:80" diff --git a/docker-compose.yml b/docker-compose.yml index 9e1ba08..251bf6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: puffin-calculator: - image: code.letsbe.solutions/matt/puffinoffsetcalculator:latest + build: . container_name: puffin-calculator ports: - "8080:80" diff --git a/setup.sh b/setup.sh index faca2e4..bd4b988 100644 --- a/setup.sh +++ b/setup.sh @@ -25,20 +25,8 @@ if ! command -v docker-compose &> /dev/null; then exit 1 fi -echo "Logging into Gitea container registry..." -echo "Please enter your Gitea credentials when prompted:" -docker login code.letsbe.solutions - -if [ $? -ne 0 ]; then - echo "========================================" - echo "Error: Failed to log in to the Gitea registry." - echo "Please check your credentials and try again." - echo "========================================" - exit 1 -fi - -echo "Pulling and starting the Docker container..." -docker-compose up -d +echo "Building and starting the Docker container..." +docker-compose up -d --build if [ $? -eq 0 ]; then echo "========================================"