From 609cc22b5184c08b4751e13447fe9e1276e0feb9 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 17:31:18 -0400 Subject: [PATCH] Updated docker (#1) Reviewed-on: http://git.kundeng.us/phoenix/textsender-auth/pulls/1 --- .gitea/workflows/workflow.yaml | 6 +++++- Dockerfile | 3 ++- docker-compose.yaml | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 5240437..5cb7111 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -36,6 +36,8 @@ jobs: cat > ~/.gitconfig << "EOF" [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"] insteadOf = https://${{ secrets.GIT_HOST_ROOT }} + [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"] + insteadOf = http://${{ secrets.GIT_HOST_ROOT }} EOF echo "Building binary" @@ -49,7 +51,7 @@ jobs: runs-on: ubuntu-24.04 services: postgres: - image: postgres:18.3-alpine + image: postgres:18.4-alpine env: POSTGRES_USER: ${{ secrets.DB_TEST_USER }} POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD }} @@ -125,6 +127,8 @@ jobs: cat > ~/.gitconfig << "EOF" [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"] insteadOf = https://${{ secrets.GIT_HOST_ROOT }} + [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"] + insteadOf = http://${{ secrets.GIT_HOST_ROOT }} EOF go test -v ./... diff --git a/Dockerfile b/Dockerfile index 639487f..ce72ee9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,8 @@ RUN mkdir -p -m 0700 ~/.ssh && \ ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts # Configure Git to use SSH for GitHub -RUN git config --global url."ssh://git@git.kundeng.us".insteadOf "https://git.kundeng.us" +RUN git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/" && \ + git config --global url."git@git.kundeng.us:".insteadOf "http://git.kundeng.us/" # Set up the Go environment for private modules ENV GOPRIVATE=git.kundeng.us diff --git a/docker-compose.yaml b/docker-compose.yaml index 946824e..56afe67 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,7 +18,7 @@ services: # PostgreSQL Database Service auth_db: - image: postgres:18.3-alpine # Use an official Postgres image (Alpine variant is smaller) + image: postgres:18.4-alpine # Use an official Postgres image (Alpine variant is smaller) container_name: textsender_auth_db # Optional: Give the container a specific name environment: # These MUST match the user, password, and database name in the DATABASE_URL above @@ -27,7 +27,7 @@ services: POSTGRES_DB: ${POSTGRES_AUTH_DB:-textsender_auth_db} volumes: # Persist database data using a named volume - - postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql ports: [] healthcheck: # Checks if Postgres is ready to accept connections