Skip to content

Commit e88cec9

Browse files
committed
fix: db connection inside of the docker img
1 parent bab7448 commit e88cec9

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
username: ${{ github.actor }}
2828
password: ${{ secrets.PAT_TOKEN }}
2929

30-
- name: Push Multi-Architecture Docker Image to GitHub Container Registry
30+
- name: Push Docker Image to GitHub Container Registry
3131
uses: docker/build-push-action@v5
3232
with:
3333
context: .
3434
dockerfile: Dockerfile
3535
push: true
36-
platforms: linux/amd64,linux/arm64
36+
platforms: linux/amd64
3737
tags: ghcr.io/${{ github.repository }}/${{ secrets.DOCKER_CONTAINER_NAME }}:v1.0.0
3838
cache-from: type=gha
3939
cache-to: type=gha,mode=max
@@ -82,11 +82,6 @@ jobs:
8282
NEWSLETTER_NAME3=${{ secrets.NEWSLETTER_NAME3 }}
8383
NEWSLETTER_JID4=${{ secrets.NEWSLETTER_JID4 }}
8484
NEWSLETTER_NAME4=${{ secrets.NEWSLETTER_NAME4 }}
85-
VPS_SSH_KEY=${{ secrets.VPS_SSH_KEY }}
86-
VPS_IP_ADDRESS=${{ secrets.VPS_IP_ADDRESS }}
87-
VPS_USERNAME=${{ secrets.VPS_USERNAME }}
88-
VPS_PORT=${{ secrets.VPS_PORT }}
89-
PAT_TOKEN=${{ secrets.PAT_TOKEN }}
9085
EOF
9186
chmod 600 .env
9287

internal/whatsapp/client.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ func GetNewsletterData() (string, error) {
3939
}
4040

4141
func GetDetailedNewsletterData() (*NewsletterData, error) {
42-
_ = godotenv.Load("../.env")
42+
// We don't need to load .env in container as environment variables are set in docker-compose
43+
_ = godotenv.Load()
4344

4445
jidStrNumber := os.Getenv("NUMBER_NEWSLETTERS")
4546
if jidStrNumber == "" {
@@ -80,7 +81,7 @@ func GetDetailedNewsletterData() (*NewsletterData, error) {
8081
func getDetailedSubscriberData(newsletters []NewsletterInfo) (*NewsletterData, error) {
8182
dbLog := waLog.Stdout("Database", "INFO", true)
8283

83-
container, err := sqlstore.New(context.Background(), "sqlite3", "file:../db/session.db?_foreign_keys=on", dbLog)
84+
container, err := sqlstore.New(context.Background(), "sqlite3", "file:/root/db/session.db?_foreign_keys=on", dbLog)
8485
if err != nil {
8586
return nil, err
8687
}
@@ -195,7 +196,7 @@ func getDetailedSubscriberData(newsletters []NewsletterInfo) (*NewsletterData, e
195196
func getTotalSubscribers(jidStrs []string) (int, error) {
196197
dbLog := waLog.Stdout("Database", "INFO", true)
197198

198-
container, err := sqlstore.New(context.Background(), "sqlite3", "file:../db/session.db?_foreign_keys=on", dbLog)
199+
container, err := sqlstore.New(context.Background(), "sqlite3", "file:/root/db/session.db?_foreign_keys=on", dbLog)
199200
if err != nil {
200201
return 0, err
201202
}

0 commit comments

Comments
 (0)