From 3bf79b1765e408342c562600f010f20f337fa856 Mon Sep 17 00:00:00 2001 From: Javier Rodriguez Date: Tue, 19 Aug 2025 19:02:51 +0200 Subject: [PATCH] Revert "fix(atlas): Bump Atlas version (#2366)" This reverts commit b75b7bcc24c35822820226e5314d3a497fd809b2. --- .github/workflows/test.yml | 2 +- app/controlplane/Dockerfile.migrations | 6 +++--- common.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22bc96561..de8f1166f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: - name: Generate migrations if: ${{ matrix.app == 'controlplane' }} env: - ATLAS_VERSION: v0.36.0 + ATLAS_VERSION: v0.35.0 run: | wget -q https://release.ariga.io/atlas/atlas-linux-amd64-$ATLAS_VERSION -O /tmp/atlas sudo install /tmp/atlas /usr/local/bin/atlas diff --git a/app/controlplane/Dockerfile.migrations b/app/controlplane/Dockerfile.migrations index 99d72fc63..6b026d00d 100644 --- a/app/controlplane/Dockerfile.migrations +++ b/app/controlplane/Dockerfile.migrations @@ -1,9 +1,9 @@ # Container image built by go-releaser that's used to run migrations against the database during deployment # See https://atlasgo.io/guides/deploying/image # from: arigaio/atlas:latest -# docker run arigaio/atlas@sha256:2a621eff7cc837aec47f6504f17bfc95659ad7198f6e93f4145046b831a72066 version -# atlas version v0.36.3-1fac927-canary -FROM arigaio/atlas@sha256:2a621eff7cc837aec47f6504f17bfc95659ad7198f6e93f4145046b831a72066 as base +# docker run arigaio/atlas@sha256:16739cffc8d44d04e76f58842dc12835e183fe7164d0ae55544fc8bc9fbb1e33 version +# atlas version v0.35.0 +FROM arigaio/atlas@sha256:16739cffc8d44d04e76f58842dc12835e183fe7164d0ae55544fc8bc9fbb1e33 as base FROM scratch # Update permissions to make it readable by the user diff --git a/common.mk b/common.mk index 1b26b6854..08fee8e4d 100644 --- a/common.mk +++ b/common.mk @@ -7,9 +7,9 @@ init: init-api-tools go install github.com/vektra/mockery/v3@v3.5.0 # using binary release for atlas, since ent schema handler is not included # in the community version anymore https://github.com/ariga/atlas/issues/2388#issuecomment-1864287189 + curl -sSf https://atlasgo.sh | ATLAS_VERSION=v0.35.0 sh -s -- -y # install golangci-lint with Go 1.25 support curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v2.4.0 - curl -sSf https://atlasgo.sh | ATLAS_VERSION=v0.36.0 sh -s -- -y # initialize API tooling .PHONY: init-api-tools