Merge pull request #142 from Cufee/release

Release
Cufee · Jan 20, 2025 · 2b63c36 · 2b63c36
2 parents 733078d + f5ed5f0
commit 2b63c36
Show file tree

Hide file tree

Showing 41 changed files with 1,597 additions and 1,178 deletions.
diff --git a/Dockerfile.migrate b/Dockerfile.migrate
@@ -1,3 +1,7 @@
-FROM arigaio/atlas:latest
+FROM golang:1.23-bookworm as builder-go
+
+RUN go install -tags 'sqlite3' github.com/golang-migrate/migrate/v4/cmd/migrate@latest  
 
 COPY ./internal/database/migrations /migrations
+
+ENTRYPOINT [ "migrate" ]
diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -55,14 +55,14 @@ tasks:
     cmds:
       # variables will be pulled from global vars declaration unless overwritten in the task call
       - echo "Applying migrations to $DATABASE_PATH/$DATABASE_NAME"
-      - atlas migrate apply --env local
+      - migrate -verbose -path internal/database/migrations -database sqlite3://{{.DATABASE_PATH}}/{{.DATABASE_NAME}}?_fk=1 up
 
   db-migrate-tests:
     desc: apply migrations using atlas
     dotenv:
       - ".env.test"
     cmds:
-      - atlas migrate apply --env local
+      - migrate -verbose -path internal/database/migrations -database sqlite3://{{.DATABASE_PATH}}/{{.DATABASE_NAME}}?_fk=1 up
 
   build-widget:
     desc: Build amth-widget js assets

diff --git a/atlas.hcl b/atlas.hcl
@@ -7,7 +7,7 @@ variable "database_path" {
   default = getenv("DATABASE_PATH")
 }
 variable "sources" {
-  type    = list(string)
+  type = list(string)
   default = [
     "file://internal/database/schema/schema.hcl",
     "file://internal/database/schema/accounts.hcl",
@@ -24,7 +24,7 @@ env "local" {
   src = var.sources
 
   migration {
-    dir = "file://internal/database/migrations"
+    dir = "file://internal/database/migrations?format=golang-migrate"
   }
 
   url = "sqlite://${var.database_path}/${var.database_name}?_fk=1"

diff --git a/docker-compose.base.yaml b/docker-compose.base.yaml
@@ -3,11 +3,11 @@
 services:
   aftermath-migrate-base:
     pull_policy: always
-    image: ghcr.io/cufee/aftermath-migrations:${ENVIRONMENT}
+    # image: ghcr.io/cufee/aftermath-migrations:${ENVIRONMENT}
     build:
       context: .
       dockerfile: Dockerfile.migrate
-    command: migrate apply --allow-dirty --dir "file:///migrations" --tx-mode all --url "sqlite:///data/${DATABASE_NAME}?_fk=1"
+    command: -source file:///migrations -database sqlite3:///data/${DATABASE_NAME}?_fk=1 up
     volumes:
       - ${DATABASE_PATH}:/data
     deploy:

diff --git a/docker-compose.dokploy.yaml b/docker-compose.dokploy.yaml
@@ -33,7 +33,7 @@ services:
       - docker-volume-backup.stop-during-backup=true # https://hub.docker.com/r/offen/docker-volume-backup
     depends_on:
       aftermath-migrate:
-        condition: service_started
+        condition: service_completed_successfully
 
 networks:
   dokploy-network:

diff --git a/internal/database/migrations/20240709203105.sql b/internal/database/migrations/20240709203105.sql
diff --git a/internal/database/migrations/20240709213804.sql b/internal/database/migrations/20240709213804.sql
diff --git a/internal/database/migrations/20240710142748.sql b/internal/database/migrations/20240710142748.sql
diff --git a/internal/database/migrations/20240714172357.sql b/internal/database/migrations/20240714172357.sql
diff --git a/internal/database/migrations/20240717182230.sql b/internal/database/migrations/20240717182230.sql
diff --git a/internal/database/migrations/20240718195751.sql b/internal/database/migrations/20240718195751.sql
diff --git a/internal/database/migrations/20240720185422.sql b/internal/database/migrations/20240720185422.sql
diff --git a/internal/database/migrations/20240721174451.sql b/internal/database/migrations/20240721174451.sql
diff --git a/internal/database/migrations/20240721174654.sql b/internal/database/migrations/20240721174654.sql
diff --git a/internal/database/migrations/20240722193937.sql b/internal/database/migrations/20240722193937.sql
diff --git a/internal/database/migrations/20240722221009.sql b/internal/database/migrations/20240722221009.sql
diff --git a/internal/database/migrations/20240723170847.sql b/internal/database/migrations/20240723170847.sql
diff --git a/internal/database/migrations/20240724172106.sql b/internal/database/migrations/20240724172106.sql
diff --git a/internal/database/migrations/20240728003612.sql b/internal/database/migrations/20240728003612.sql