From 13a3a5fb9b6fa6d261312186f535677c7032fc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Wed, 23 Nov 2022 17:57:41 +0000
Subject: [PATCH 1/3] Add ability to skip post-deployment migrations for
 registry DB

---
 docker-compose.yml                              | 1 +
 gitlab-container-registry/scripts/db-migrate    | 4 +++-
 gitlab-container-registry/scripts/wait-for-deps | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e0715f0d6..407f02c9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -134,6 +134,7 @@ services:
     command: ["/scripts/wait-for-deps", "/scripts/db-migrate"]
     environment:
       - "BYPASS_SCHEMA_VERSION=1"
+      - "SKIP_POST_DEPLOYMENT_MIGRATIONS=1"
     depends_on:
       - postgres
     volumes:
diff --git a/gitlab-container-registry/scripts/db-migrate b/gitlab-container-registry/scripts/db-migrate
index 58a36ad9d..63804818e 100755
--- a/gitlab-container-registry/scripts/db-migrate
+++ b/gitlab-container-registry/scripts/db-migrate
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-registry database migrate up ${CONFIG_DIRECTORY}/${CONFIG_FILENAME}
+SKIP_POST_DEPLOY="${SKIP_POST_DEPLOYMENT_MIGRATIONS:-}"
+
+registry database migrate up ${SKIP_POST_DEPLOY:+ --skip-post-deployment} ${CONFIG_DIRECTORY}/${CONFIG_FILENAME}
\ No newline at end of file
diff --git a/gitlab-container-registry/scripts/wait-for-deps b/gitlab-container-registry/scripts/wait-for-deps
index 7d19706c3..730a5ab3f 100755
--- a/gitlab-container-registry/scripts/wait-for-deps
+++ b/gitlab-container-registry/scripts/wait-for-deps
@@ -3,12 +3,13 @@
 WAIT_FOR_TIMEOUT="${WAIT_FOR_TIMEOUT:-30}"
 SLEEP_DURATION="${SLEEP_DURATION:-1}"
 BYPASS_SCHEMA_VERSION="${BYPASS_SCHEMA_VERSION:-}"
+SKIP_POST_DEPLOY="${SKIP_POST_DEPLOYMENT_MIGRATIONS:-}"
 
 TMP=$(mktemp)
 
 function checkStatus {
   # result=true|false, if command successful
-  result=$(registry database migrate status --up-to-date ${CONFIG_DIRECTORY}/${CONFIG_FILENAME})
+  result=$(registry database migrate status --up-to-date ${SKIP_POST_DEPLOY:+ --skip-post-deployment} ${CONFIG_DIRECTORY}/${CONFIG_FILENAME})
   ret=$?
 
   if [ $ret -eq 0 ]; then
-- 
GitLab


From 583b5f3d1cda6d7ff7b996c3a9701d8c8125f69e Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 2 Dec 2022 14:44:15 +0000
Subject: [PATCH 2/3] Apply 1 suggestion(s) to 1 file(s)

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 407f02c9a..8902c2aaa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -149,6 +149,7 @@ services:
       - "${REGISTRY_PORT}:5000"
     environment:
       - "REGISTRY_AUTH_TOKEN_REALM='http://localhost:${HOST_PORT}/jwt/auth'"
+      - "SKIP_POST_DEPLOYMENT_MIGRATIONS=1"
     volumes:
       - ./dev/registry/config.yml:/etc/docker/registry/config.yml
       - ./dev/registry/gitlab-registry.crt:/etc/docker/registry/gitlab-registry.crt
-- 
GitLab


From 133701a2d4e1eda2a2f6c6ec480e562c053cad28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Fri, 9 Dec 2022 15:54:10 +0000
Subject: [PATCH 3/3] Do not skip post-deployment migrations

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8902c2aaa..e0715f0d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -134,7 +134,6 @@ services:
     command: ["/scripts/wait-for-deps", "/scripts/db-migrate"]
     environment:
       - "BYPASS_SCHEMA_VERSION=1"
-      - "SKIP_POST_DEPLOYMENT_MIGRATIONS=1"
     depends_on:
       - postgres
     volumes:
@@ -149,7 +148,6 @@ services:
       - "${REGISTRY_PORT}:5000"
     environment:
       - "REGISTRY_AUTH_TOKEN_REALM='http://localhost:${HOST_PORT}/jwt/auth'"
-      - "SKIP_POST_DEPLOYMENT_MIGRATIONS=1"
     volumes:
       - ./dev/registry/config.yml:/etc/docker/registry/config.yml
       - ./dev/registry/gitlab-registry.crt:/etc/docker/registry/gitlab-registry.crt
-- 
GitLab