Merge pull request #1626 from IntersectMBO/develop

Sancho-v1.0.11-dev
IntersectMBO · Jul 30, 2024 · 2de19b1 · 2de19b1
2 parents 1b881be + aeb0554
commit 2de19b1
Show file tree

Hide file tree

Showing 10 changed files with 10,482 additions and 3,035 deletions.
diff --git a/.github/workflows/resync-cardano-node-and-db-sync.yml b/.github/workflows/resync-cardano-node-and-db-sync.yml
@@ -43,9 +43,11 @@ jobs:
       run:
         working-directory: ./scripts/govtool
     env:
-      DBSYNC_POSTGRES_DB: "cexplorer"
-      DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
-      DBSYNC_POSTGRES_USER: "postgres"
+      DBSYNC_POSTGRES_DB: ${{ secrets.DBSYNC_POSTGRES_DB || 'cexplorer' }}
+      DBSYNC_POSTGRES_PASSWORD: ${{ secrets.DBSYNC_POSTGRES_PASSWORD || 'pSa8JCpQOACMUdGb' }}
+      DBSYNC_POSTGRES_USER: ${{ secrets.DBSYNC_POSTGRES_USER || 'postgres' }}
+      DBSYNC_POSTGRES_HOST: ${{ secrets.DBSYNC_POSTGRES_HOST || 'postgres' }}
+      DBSYNC_POSTGRES_PORT: ${{ secrets.DBSYNC_POSTGRES_PORT || '5432' }}
       GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
       GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,20 @@ changes.
 
 -
 
+## [sancho-v1.0.11](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.11) 2024-07-30
+
+### Added
+
+-
+
+### Fixed
+
+- Fix unbound variable in the resync cardano node github workflow [Issue 1624](https://github.com/IntersectMBO/govtool/issues/1624)
+
+### Changed
+
+- bump @intersect.mbo/pdf-ui to v0.3.2
+
 ## [sancho-v1.0.10](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.10) 2024-07-29
 
 ### Added

diff --git a/govtool/backend/Dockerfile b/govtool/backend/Dockerfile
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.10/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.11/x/vva-be/build/vva-be/vva-be /usr/local/bin
diff --git a/govtool/backend/Dockerfile.qovery b/govtool/backend/Dockerfile.qovery
@@ -0,0 +1,13 @@
+ARG BASE_IMAGE_TAG=latest
+ARG BASE_IMAGE_REPO=ghcr.io/intersectmbo/backend-base
+FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
+WORKDIR /src
+COPY . .
+RUN cabal build
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.11/x/vva-be/build/vva-be/vva-be /usr/local/bin
+
+# Expose the necessary port
+EXPOSE 9876
+
+# Default command (can be overridden by docker-compose or docker run)
+CMD ["/usr/local/bin/vva-be", "-c", "/run/secrets/backend-config.json", "start-app"]
diff --git a/govtool/backend/vva-be.cabal b/govtool/backend/vva-be.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            1.0.10
+version:            1.0.11
 
 -- A short (one-line) description of the package.
 -- synopsis:
@@ -20,7 +20,6 @@ maintainer:         [email protected]
 -- copyright:
 -- category:
 extra-source-files:
-  CHANGELOG.md
   sql/get-voting-power.sql
   sql/list-dreps.sql
   sql/get-delegates.sql