Merge branch 'main' into chore/fund14-dev-continuos-snap

Author: kukkok3

.github/workflows/ci-test.yml

@@ -23,16 +23,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Forge
-        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
         with:
-          version: 0.8.0
+          version: 0.14.0
         if: always()
 
       - name: Setup CI
-        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
 
       - name: Run tests
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
         if: always()
         continue-on-error: true
         with:

.github/workflows/ci.yml

@@ -10,6 +10,6 @@ permissions:
 
 jobs:
   ci:
-    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.3
+    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.1
     with:
-      forge_version: 0.8.1
+      forge_version: 0.14.0

Earthfile

@@ -92,7 +92,7 @@ all:
     END
 
     # Build and tag all Docker images
-    BUILD ./containers/event-db-migrations+publish --tag=$tag --registry=$registry_final
+    BUILD ./containers/event-db-migrations+package --tag=$tag --registry=$registry_final
 
     # Build crate images from the workspace
     BUILD ./src/jormungandr/jormungandr+docker --tag=$tag --registry=$registry_final
@@ -101,7 +101,7 @@ all:
     BUILD ./src/voting-tools-rs+docker --tag=$tag --registry=$registry_final
     BUILD ./src/cat-data-service+publish --tag=$tag --registry=$registry_final
 
-    BUILD ./services/voting-node+publish --tag=$tag --registry=$registry_final
+    BUILD ./services/voting-node+package --tag=$tag --registry=$registry_final
     BUILD ./utilities/ideascale-importer+docker --tag=$tag --registry=$registry_final
 
 all-with-tags:
@@ -147,9 +147,9 @@ tag-workspace:
 
 local:
     LOCALLY
-    BUILD ./containers/event-db-migrations+publish
+    BUILD ./containers/event-db-migrations+package
     BUILD ./src/cat-data-service+publish
-    BUILD ./services/voting-node+publish
+    BUILD ./services/voting-node+package
 
     RUN mkdir -p ./local
     COPY ./containers/dev-local+build/docker-compose.yml ./local/

blueprint.cue

@@ -0,0 +1,60 @@
+version: "1.0"
+global: {
+	ci: {
+		local: [
+			"^check(-.*)?$",
+			"^build(-.*)?$",
+			"^package(-.*)?$",
+			"^test(-.*)?$",
+		]
+		registries: [
+			ci.providers.aws.ecr.registry,
+		]
+		providers: {
+			aws: {
+				region: "eu-central-1"
+				ecr: registry: "332405224602.dkr.ecr.eu-central-1.amazonaws.com"
+				role: "arn:aws:iam::332405224602:role/ci"
+			}
+
+			docker: credentials: {
+				provider: "aws"
+				path:     "global/ci/docker"
+			}
+
+			git: credentials: {
+				provider: "aws"
+				path:     "global/ci/deploy"
+			}
+
+			earthly: {
+				credentials: {
+					provider: "aws"
+					path:     "global/ci/earthly"
+				}
+				org:       "Catalyst"
+				satellite: "ci"
+				version:   "0.8.15"
+			}
+
+			github: registry: "ghcr.io"
+
+			kcl: {
+				install: true
+				version: "v0.11.0"
+			}
+		}
+		secrets: [
+			{
+				name:     "GITHUB_TOKEN"
+				optional: true
+				provider: "env"
+				path:     "GITHUB_TOKEN"
+			},
+		]
+	}
+	repo: {
+		defaultBranch: "main"
+		name:          "input-output-hk/catalyst-core"
+	}
+}

containers/event-db-migrations/Earthfile

@@ -12,7 +12,7 @@ build:
     SAVE ARTIFACT ./bin/refinery refinery
     SAVE IMAGE --cache-hint
 
-publish:
+package:
     FROM debian:stable-slim
     ARG tag="latest"
     ARG data="historic"
@@ -63,3 +63,11 @@ publish:
 #         --load test:latest=+docker
 #         RUN docker run test:latest
 #     END
+
+docker:
+    FROM +package
+
+    ARG container='migrations'
+    ARG tag="latest"
+
+    SAVE IMAGE ${container}:${tag}

containers/event-db-migrations/blueprint.cue

@@ -0,0 +1,15 @@
+version: "1.0.0"
+project: {
+	name: "event-db-migrations"
+	release: {
+		docker: {
+			on: {
+				merge: {}
+				tag: {}
+			}
+			config: {
+				tag: _ @forge(name="GIT_HASH_OR_TAG")
+			}
+		}
+	}
+}

services/voting-node/Earthfile

@@ -43,7 +43,7 @@ deps:
     # Install package dependencies without the voting_node package
     RUN poetry install --only main --no-root
     RUN poetry self add poetry-plugin-export
-
+    
     # Copy the voting_node source code
     COPY --dir voting_node README.md ./
 
@@ -91,7 +91,7 @@ pdoc:
     SAVE ARTIFACT /doc
 
 # Docker image built for distribution and use in production.
-publish:
+package:
     FROM python:3.11-slim-bullseye
     ARG tag="latest"
 
@@ -165,3 +165,11 @@ integration-test:
                 --service leader0
         RUN docker-compose run leader0 echo "<<<INTEGRATION TESTING GOES HERE>>>"
     END
+
+docker:
+    FROM +package
+
+    ARG container='voting-node'
+    ARG tag="latest"
+
+    SAVE IMAGE ${container}:${tag}

services/voting-node/blueprint.cue

@@ -0,0 +1,15 @@
+version: "1.0.0"
+project: {
+	name: "voting-node"
+	release: {
+		docker: {
+			on: {
+				merge: {}
+				tag: {}
+			}
+			config: {
+				tag: _ @forge(name="GIT_HASH_OR_TAG")
+			}
+		}
+	}
+}