diff --git a/quickstart/dev/docker-compose.deps.yml b/quickstart/dev/docker-compose.deps.yml index f7f0ee1bef..daa0c71417 100644 --- a/quickstart/dev/docker-compose.deps.yml +++ b/quickstart/dev/docker-compose.deps.yml @@ -139,8 +139,8 @@ services: command: '"kratos migrate sql up -y -e && kratos serve -c /home/ory/kratos.yml --watch-courier --sqa-opt-out"' environment: DSN: postgres://dbuser:secret@kratos-pg:5432/default?sslmode=disable - links: - - kratos-pg:kratos-pg + depends_on: + - kratos-pg volumes: - ${HOST_PROJECT_PATH:-.}/config/ory:/home/ory kratos-pg: @@ -340,7 +340,6 @@ services: - ${HOST_PROJECT_PATH:-.}/config/otel-agent-config.yaml:/etc/otel-agent-config.yaml svix: image: svix/svix-server:v1.38 - platform: linux/amd64 environment: WAIT_FOR: "true" SVIX_DB_DSN: postgresql://postgres:postgres@svix-pg/postgres diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml index 1632fa682f..85af1f9d90 100644 --- a/quickstart/docker-compose.tmpl.yml +++ b/quickstart/docker-compose.tmpl.yml @@ -1,8 +1,8 @@ #@ load("@ytt:data", "data") -#@ galoy_api_image_digest = "sha256@a180c47010ae7892ec7c04207885f98ae51ae8fed248a5a5826fe22149eb6a27" -#@ galoy_trigger_image_digest = "sha256@c57593a4915284e415a93103d3bfef1f6ab1948cbf8e95129c96967fdf620646" -#@ mongodb_migrate_image_digest = "sha256@7360aa4dc96740cd29ee4931e651f15d3e1e90d25bb79387e943eb25b7a656b6" +#@ galoy_api_image_digest = "sha256@d946a4de44c88dc188f5f416176c350acfecce8173b034bde75d7360b6865454" +#@ galoy_trigger_image_digest = "sha256@9dd26b7190215326627364fbb76d0cb9b98fd9debafb48db69b74cd09b223aeb" +#@ mongodb_migrate_image_digest = "sha256@bdf753fcf44e8eab32d5b0410b79fffcb58a8d5f389be1d92fd261cdc15fc0a7" #@ galoy_notifications_image_digest = "sha256@71c53ab3d9a4282d44d0605b95f1691ebc23334e8108bd4d06021a0c627a1205" #@ core_env = [ diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index fb60bc9204..61c9925228 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -55,8 +55,8 @@ services: command: '"kratos migrate sql up -y -e && kratos serve -c /home/ory/kratos.yml --watch-courier --sqa-opt-out"' environment: DSN: postgres://dbuser:secret@kratos-pg:5432/default?sslmode=disable - links: - - kratos-pg:kratos-pg + depends_on: + - kratos-pg volumes: - ${HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}/dev/config/ory:/home/ory kratos-pg: @@ -98,7 +98,7 @@ services: - POSTGRES_PASSWORD=secret - POSTGRES_DB=hydra galoy: - image: us.gcr.io/galoy-org/galoy-api@sha256:a180c47010ae7892ec7c04207885f98ae51ae8fed248a5a5826fe22149eb6a27 + image: us.gcr.io/galoy-org/galoy-api@sha256:d946a4de44c88dc188f5f416176c350acfecce8173b034bde75d7360b6865454 environment: - HELMREVISION=dev - NETWORK=regtest @@ -157,7 +157,7 @@ services: aliases: - bats-tests trigger: - image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:c57593a4915284e415a93103d3bfef1f6ab1948cbf8e95129c96967fdf620646 + image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:9dd26b7190215326627364fbb76d0cb9b98fd9debafb48db69b74cd09b223aeb environment: - HELMREVISION=dev - NETWORK=regtest @@ -242,7 +242,7 @@ services: environment: - MONGO_INITDB_DATABASE=galoy mongodb-migrate: - image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:7360aa4dc96740cd29ee4931e651f15d3e1e90d25bb79387e943eb25b7a656b6 + image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:bdf753fcf44e8eab32d5b0410b79fffcb58a8d5f389be1d92fd261cdc15fc0a7 depends_on: - mongodb environment: @@ -449,7 +449,6 @@ services: - ${HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}/dev/config/otel-agent-config.yaml:/etc/otel-agent-config.yaml svix: image: svix/svix-server:v1.38 - platform: linux/amd64 environment: WAIT_FOR: "true" SVIX_DB_DSN: postgresql://postgres:postgres@svix-pg/postgres diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml index d0da7e7ddd..ef9708b4b3 100644 --- a/quickstart/vendir.lock.yml +++ b/quickstart/vendir.lock.yml @@ -2,24 +2,24 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'chore: update lnd version to 0.18.4 (#4691)' - sha: a2ab6e3912ebae6b517480c0317f576dfd13d50e + commitTitle: 'fix(core): remove links from docker compose (#4693)...' + sha: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30 tags: - - 0.21.16-1-ga2ab6e391 + - 0.21.17-1-g38a25bdbc path: . path: dev - contents: - git: - commitTitle: 'chore: update lnd version to 0.18.4 (#4691)' - sha: a2ab6e3912ebae6b517480c0317f576dfd13d50e + commitTitle: 'fix(core): remove links from docker compose (#4693)...' + sha: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30 tags: - - 0.21.16-1-ga2ab6e391 + - 0.21.17-1-g38a25bdbc path: schemas - git: - commitTitle: 'chore: update lnd version to 0.18.4 (#4691)' - sha: a2ab6e3912ebae6b517480c0317f576dfd13d50e + commitTitle: 'fix(core): remove links from docker compose (#4693)...' + sha: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30 tags: - - 0.21.16-1-ga2ab6e391 + - 0.21.17-1-g38a25bdbc path: gql path: graphql kind: LockConfig diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml index bb4da5269f..453da472a5 100644 --- a/quickstart/vendir.yml +++ b/quickstart/vendir.yml @@ -6,7 +6,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e + ref: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30 includePaths: - dev/**/* excludePaths: @@ -18,7 +18,7 @@ directories: - path: schemas/ git: url: https://github.com/GaloyMoney/galoy.git - ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e + ref: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30 includePaths: - core/api/src/graphql/public/schema.graphql - core/api/src/graphql/admin/schema.graphql @@ -26,7 +26,7 @@ directories: - path: gql/ git: url: https://github.com/GaloyMoney/galoy.git - ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e + ref: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30 includePaths: - bats/gql/**/* newRootPath: bats/gql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index f0e2b67338..769405cd66 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,3 @@ #@data/values --- -galoy_git_ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e +galoy_git_ref: 38a25bdbcd1091bb7a6b22434a2f15b4ec736a30