From 94b80aeeccbf991d78d6714c38f42f59a2374161 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 19:11:17 -0400 Subject: [PATCH] Docker fixes (#1) Reviewed-on: http://git.kundeng.us/phoenix/textsender-api/pulls/1 --- .gitea/workflows/workflow.yaml | 6 +++++- Dockerfile | 5 +++-- docker-compose.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 7458eaa..2c1eef7 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 2dbbb24..ad58f9d 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 @@ -20,7 +21,7 @@ ENV GOPRIVATE=git.kundeng.us # Copy go mod and sum files COPY go.mod go.sum ./ -RUN --mount=type=ssh mkdir src && \ +RUN --mount=type=ssh \ go mod download # Copy source code diff --git a/docker-compose.yaml b/docker-compose.yaml index 98ba1b1..b1b641c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -53,7 +53,7 @@ services: # PostgreSQL Database Service main_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_db # Optional: Give the container a specific name environment: # These MUST match the user, password, and database name in the DATABASE_URL above @@ -62,7 +62,7 @@ services: POSTGRES_DB: ${POSTGRES_AUTH_DB:-textsender_db} volumes: # Persist database data using a named volume - - postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql ports: - "5432:5432" healthcheck: @@ -77,7 +77,7 @@ services: restart: always # Optional: Restart policy 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 @@ -86,7 +86,7 @@ services: POSTGRES_DB: ${POSTGRES_AUTH_DB:-textsender_auth_db} volumes: # Persist database data using a named volume - - postgres_data_auth:/var/lib/postgresql/data + - postgres_data_auth:/var/lib/postgresql ports: - "5433:5432" healthcheck: