fix: uses correct id in argocd container (#87)

Author: jmgilman

.github/workflows/ci.yml

@@ -138,7 +138,7 @@ jobs:
       earthly_token: ${{ secrets.earthly_token }}
 
   release:
-    uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@master
+    uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@fix-argo-container
     needs: [discover, check, build, test]
     if: (fromJson(needs.discover.outputs.releases)[0] != null) && !failure() && !cancelled()
     with:

foundry/api/blueprint.cue

@@ -17,7 +17,7 @@ project: {
 		environment: "dev"
 		modules: main: {
 			container: "foundry-api-deployment"
-			version:   "0.1.0"
+			version:   "0.1.1"
 			values: {
 				environment: name: "dev"
 				server: image: {

tools/argocd/Earthfile

@@ -3,7 +3,7 @@ VERSION 0.8
 timoni:
     FROM golang:1.23.0
 
-    ARG TIMONI_VERSION=v0.22.1
+    ARG TIMONI_VERSION=v0.17.0
 
     WORKDIR /work
 
@@ -20,7 +20,8 @@ docker:
     ARG TARGETARCH
     ARG USERPLATFORM
 
-    RUN useradd -m argocd
+    RUN apt-get update && apt-get install -y ca-certificates amazon-ecr-credential-helper
+    RUN useradd -m -u 999 argocd
 
     USER argocd
     WORKDIR /home/argocd
@@ -36,7 +37,8 @@ docker:
     RUN mkdir -p cmp-server/config
     COPY plugin.yml cmp-server/config/plugin.yaml
 
-    ENTRYPOINT [ "/var/run/argocd/argocd-cmp-server" ]
-    SAVE IMAGE ${container}:${tag}
-
+    COPY init.sh /home/argocd/init.sh
+    RUN chmod +x /home/argocd/init.sh
 
+    ENTRYPOINT [ "/var/run/argocd/argocd-cmp-server", "--loglevel=info" ]
+    SAVE IMAGE ${container}:${tag}

tools/argocd/blueprint.cue

@@ -4,8 +4,9 @@ project: {
 	release: {
 		docker: {
 			on: {
-				merge: {}
-				tag: {}
+				//merge: {}
+				//tag: {}
+				always: {}
 			}
 			config: {
 				tag: _ @forge(name="GIT_COMMIT_HASH")

tools/argocd/init.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
+ACCOUNT_ID=$(echo "${AWS_ROLE_ARN}" | cut -d':' -f5)
+mkdir -p /home/argocd/.docker
+cat >/home/argocd/.docker/config.json <<EOF
+{
+    "credHelpers": {
+        "${ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com": "ecr-login"
+    }
+}
+EOF