From 7967a54f29eba88375d6b25379f02a3bbe92007f Mon Sep 17 00:00:00 2001 From: Ron Rise Date: Thu, 17 Apr 2025 17:01:32 -0400 Subject: [PATCH] fix some fucking errors (#18) Reviewed-on: https://gitea.siteworxpro.com/rrise/reloading-manager/pulls/18 Co-authored-by: Ron Rise Co-committed-by: Ron Rise --- .gitea/workflows/build.yml | 19 ++++++++++--------- backend/Dockerfile | 1 + backend/database/migrate.go | 5 ++++- docker-compose.yml | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 38d8475..22df58d 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -128,14 +128,14 @@ jobs: echo "## Do not edit this file directly. It is auto-generated by the script." > argocd/deployment/deployment.yml sed "s|__TAG__|${{ gitea.ref_name }}|g" argocd/template/deployment.yml >> argocd/deployment/deployment.yml - - name: 💾✅ Commit Updated Manifest - uses: EndBug/add-and-commit@v9 - with: - new_branch: ${{ gitea.ref_name }}-deploy - add: argocd/deployment/deployment.yml - author_name: "GitHub Action 🤖" - author_email: gitia@siteworxpro.com - message: "📝🔄 Update deployment manifest with new image tags" +# - name: 💾✅ Commit Updated Manifest +# uses: EndBug/add-and-commit@v9 +# with: +# new_branch: ${{ gitea.ref_name }}-deploy +# add: argocd/deployment/deployment.yml +# author_name: "GitHub Action 🤖" +# author_email: gitia@siteworxpro.com +# message: "📝🔄 Update deployment manifest with new image tags" - name: 🚀✨ Create Pull Request uses: peter-evans/create-pull-request@v7 @@ -145,4 +145,5 @@ jobs: base: master head: ${{ gitea.ref_name }}-deploy commit-message: "📝🔄 Update deployment manifest with new image tags" - labels: deploy \ No newline at end of file + labels: deploy + delete-branch: true \ No newline at end of file diff --git a/backend/Dockerfile b/backend/Dockerfile index 16fd9bc..a8c6e11 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -15,5 +15,6 @@ RUN go build -o app FROM scratch COPY --from=build /app/app . +ADD ./migrations /app/migrations ENTRYPOINT ["/app"] \ No newline at end of file diff --git a/backend/database/migrate.go b/backend/database/migrate.go index 59a04e2..2c3b53c 100644 --- a/backend/database/migrate.go +++ b/backend/database/migrate.go @@ -12,7 +12,10 @@ import ( func (db *Database) Migrate() { sqlDB, err := sql.Open("postgres", db.DSN()) - driver, err := postgres.WithInstance(sqlDB, &postgres.Config{}) + driver, err := postgres.WithInstance(sqlDB, &postgres.Config{ + MigrationsTable: "schema_migrations", + DatabaseName: db.databaseName, + }) if err != nil { log.Fatal(err) } diff --git a/docker-compose.yml b/docker-compose.yml index f38b168..ad14422 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ services: frontend: - image: scr.siteworxpro.com/reloading-manager/frontend:v0.0.13 + image: scr.siteworxpro.com/reloading-manager/frontend:v0.0.14 ports: - "80:80" backend: - image: scr.siteworxpro.com/reloading-manager/backend:v0.0.13 + image: scr.siteworxpro.com/reloading-manager/backend:v0.0.14 environment: DB_HOST: 192.168.1.30 DB_DATABASE: loading