debug: postgres conn string

fix: Dockerfile to include .env
fix: github ci spec
2024-11-19 17:53:06 +03:00 · 2024-11-19 17:25:20 +03:00 · 2024-11-19 17:18:13 +03:00 · 2024-11-19 15:15:24 +01:00
4 changed files with 9 additions and 7 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -10,4 +10,4 @@
 !/LICENSE
 !/README.md
 !/go.*
-!/.env
+!/.env.example
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@ -45,9 +45,7 @@ jobs:
        with:
          context: ./
          file: ./Dockerfile
-          platforms:
-            - linux/amd64
-            - linux/arm64
+          platforms: linux/amd64
          push: true
          build-args: |
            BUILD=${{ env.RELEASE_SHORT_COMMIT }}
--- a/5
+++ b/5
@ -18,7 +18,7 @@ RUN make VISE_PATH=/build/go-vise -B
 WORKDIR /build
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
-RUN go build -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go

 FROM debian:bookworm-slim

@ -33,7 +33,8 @@ COPY --from=build /build/ussd-africastalking .
 COPY --from=build /build/LICENSE .
 COPY --from=build /build/README.md .
 COPY --from=build /build/services ./services
-COPY --from=build /build/.env .
+COPY --from=build /build/.env.example .
+RUN mv .env.example .env

 EXPOSE 7123

--- a/internal/storage/storageservice.go
+++ b/internal/storage/storageservice.go
@ -41,10 +41,13 @@ func buildConnStr() string {
 	dbName := initializers.GetEnv("DB_NAME", "")
 	port := initializers.GetEnv("DB_PORT", "5432")

-	return fmt.Sprintf(
+	connString := fmt.Sprintf(
 		"postgres://%s:%s@%s:%s/%s",
 		user, password, host, port, dbName,
 	)
+	logg.Debugf("pg conn string", "conn", connString)
+
+	return connString
 }

 func NewMenuStorageService(dbDir string, resourceDir string) *MenuStorageService {
Author	SHA1	Message	Date
Mohammed Sohail	212cd48249	debug: postgres conn string Some checks failed release / docker (push) Has been cancelled Details	2024-11-19 17:53:06 +03:00
Mohammed Sohail	7adc0c9c08	fix: Dockerfile to include .env Some checks failed release / docker (push) Has been cancelled Details	2024-11-19 17:25:20 +03:00
Mohammed Sohail	0a19a6c48b	fix: github ci spec Some checks failed release / docker (push) Has been cancelled Details	2024-11-19 17:18:13 +03:00
Mohammed Sohail	66b5843b0d	feat: dockerfile and github based CI build for Africastalking variant (#174 ) ## Summary * fixed missing error handler in main * add injectable build string in main * add (dynamically linked) docker build * add github CI workflow * add extra but useful dev files in dev folder * closes #93 ## Notes * We'll move to a self-hosted CI runner once it is installed on Gitea. Reviewed-on: #174 Co-authored-by: Mohammed Sohail <sohailsameja@gmail.com> Co-committed-by: Mohammed Sohail <sohailsameja@gmail.com>	2024-11-19 15:15:24 +01:00