From 08634a68e84e89c722c8421e7d003836ca36c75a Mon Sep 17 00:00:00 2001
From: Bronek Szulc <bronek@fastmail.fm>
Date: Wed, 27 Nov 2024 15:14:59 -0500
Subject: [PATCH] migration setup

---
 .github/workflows/fly-deploy.yml   | 7 +++----
 .github/workflows/pull_request.yml | 2 +-
 Dockerfile                         | 1 +
 Makefile                           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
index a2f23c8..658123b 100644
--- a/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-deploy.yml
@@ -1,14 +1,13 @@
-# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
-
 name: Fly Deploy
+
 on:
   push:
     branches:
       - main
+
 jobs:
   deploy:
-    # if: false # disable...
-    name: Deploy app
+    name: Deploy
     runs-on: ubuntu-latest
     concurrency: deploy-group
     steps:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 3227ce9..bce061d 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -19,4 +19,4 @@ jobs:
       run: go vet ./...
 
     - name: Build
-      run: go build --o bin/piccolo cmd/piccolo/main.go
+      run: go build cmd/piccolo
diff --git a/Dockerfile b/Dockerfile
index 9d18e4a..9b28c22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ RUN if [ "$ENV" = "local" ]; then \
       go mod download; \
       go install github.com/air-verse/air@latest; \
     else \
+      go install -tags 'postgres' github.com/golang-migrate/migrate/v4/cmd/migrate@latest; \
       go build --o bin/piccolo ./cmd/piccolo; \
     fi
 
diff --git a/Makefile b/Makefile
index a4d5b95..c8b5bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ migrate_create:
 	migrate create -ext sql -dir db/migrations -seq $(name)
 
 migrate_up:
-	migrate -database $(DATABASE_URL)?sslmode=disable -path db/migrations up
+	migrate -database $(DATABASE_URL) -path db/migrations up
 
 migrate_down:
-	migrate -database $(DATABASE_URL)?sslmode=disable -path db/migrations down 1
+	migrate -database $(DATABASE_URL) -path db/migrations down 1