From b81324e1e39496ad7b98bf98db593f2f12470e22 Mon Sep 17 00:00:00 2001
From: Yorick <yorickdowne@gmail.com>
Date: Tue, 14 May 2024 08:20:16 +0000
Subject: [PATCH] Remove volume migration logic

---
 lighthouse.yml                  |  2 --
 lighthouse/Dockerfile.binary    |  2 --
 lighthouse/Dockerfile.source    |  2 --
 lighthouse/docker-entrypoint.sh | 10 ----------
 prysm.yml                       |  2 --
 prysm/Dockerfile.binary         |  2 --
 prysm/Dockerfile.source         |  2 --
 prysm/docker-entrypoint.sh      | 10 ----------
 8 files changed, 32 deletions(-)

diff --git a/lighthouse.yml b/lighthouse.yml
index 88654d25..87696e12 100644
--- a/lighthouse.yml
+++ b/lighthouse.yml
@@ -26,7 +26,6 @@ services:
     user: lhconsensus
     stop_grace_period: 1m
     volumes:
-      - lhbeacon-data:/var/lib/lighthouse-og
       - lhconsensus-data:/var/lib/lighthouse
       - /etc/localtime:/etc/localtime:ro
       - jwtsecret:/var/lib/lighthouse/beacon/ee-secret
@@ -227,7 +226,6 @@ services:
     command: /bin/sh
 
 volumes:
-  lhbeacon-data:
   lhconsensus-data:
   lhvalidator-data:
   jwtsecret:
diff --git a/lighthouse/Dockerfile.binary b/lighthouse/Dockerfile.binary
index 95040722..dd668e94 100644
--- a/lighthouse/Dockerfile.binary
+++ b/lighthouse/Dockerfile.binary
@@ -20,8 +20,6 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
-# Create mount point for old volume
-RUN mkdir -p /var/lib/lighthouse-og && chown -R ${USER}:${USER} /var/lib/lighthouse-og
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/lighthouse/beacon/ee-secret && chown -R ${USER}:${USER} /var/lib/lighthouse/beacon && chmod -R 700 /var/lib/lighthouse/beacon && chmod 777 /var/lib/lighthouse/beacon/ee-secret
 # Cannot assume buildkit, hence no chmod
diff --git a/lighthouse/Dockerfile.source b/lighthouse/Dockerfile.source
index ad28f33a..d8f0eefd 100644
--- a/lighthouse/Dockerfile.source
+++ b/lighthouse/Dockerfile.source
@@ -49,8 +49,6 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
-# Create mount point for old volume
-RUN mkdir -p /var/lib/lighthouse-og && chown -R ${USER}:${USER} /var/lib/lighthouse-og
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/lighthouse/beacon/ee-secret && chown -R ${USER}:${USER} /var/lib/lighthouse/beacon && chmod -R 700 /var/lib/lighthouse/beacon && chmod 777 /var/lib/lighthouse/beacon/ee-secret
 # Cannot assume buildkit, hence no chmod
diff --git a/lighthouse/docker-entrypoint.sh b/lighthouse/docker-entrypoint.sh
index c0b0aa0c..f186f2a7 100755
--- a/lighthouse/docker-entrypoint.sh
+++ b/lighthouse/docker-entrypoint.sh
@@ -6,16 +6,6 @@ if [ "$(id -u)" = '0' ]; then
   exec gosu lhconsensus docker-entrypoint.sh "$@"
 fi
 
-# Migrate from old to new volume
-if [[ -d /var/lib/lighthouse-og/beacon && ! -f /var/lib/lighthouse-og/beacon/migrationdone \
-    && $(ls -A /var/lib/lighthouse-og/beacon/) ]]; then
-  echo "Migrating from old Lighthouse volume to new one"
-  echo "This may take 10 minutes on a fast drive. Please be patient"
-  rsync -a --remove-source-files --exclude='ee-secret' /var/lib/lighthouse-og/beacon/ /var/lib/lighthouse/beacon/
-  touch /var/lib/lighthouse-og/beacon/migrationdone
-  echo "Migration completed, data is now in volume \"lhconsensus-data\""
-fi
-
 if [ -n "${JWT_SECRET}" ]; then
   echo -n "${JWT_SECRET}" > /var/lib/lighthouse/beacon/ee-secret/jwtsecret
   echo "JWT secret was supplied in .env"
diff --git a/prysm.yml b/prysm.yml
index dfc8f579..fffc2b43 100644
--- a/prysm.yml
+++ b/prysm.yml
@@ -28,7 +28,6 @@ services:
     user: prysmconsensus
     stop_grace_period: 1m
     volumes:
-      - prysmbeacon-data:/var/lib/prysm-og
       - prysmconsensus-data:/var/lib/prysm
       - /etc/localtime:/etc/localtime:ro
       - jwtsecret:/var/lib/prysm/ee-secret
@@ -248,7 +247,6 @@ services:
       - vc
 
 volumes:
-  prysmbeacon-data:
   prysmconsensus-data:
   prysmvalidator-data:
   jwtsecret:
diff --git a/prysm/Dockerfile.binary b/prysm/Dockerfile.binary
index 44200217..d1f04885 100644
--- a/prysm/Dockerfile.binary
+++ b/prysm/Dockerfile.binary
@@ -38,8 +38,6 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
-# Create mount point for old volume
-RUN mkdir -p /var/lib/prysm-og && chown -R ${USER}:${USER} /var/lib/prysm-og
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/prysm/ee-secret && chown -R ${USER}:${USER} /var/lib/prysm && chmod -R 700 /var/lib/prysm && chmod 777 /var/lib/prysm/ee-secret
 
diff --git a/prysm/Dockerfile.source b/prysm/Dockerfile.source
index 7b7ae0f2..5885debb 100644
--- a/prysm/Dockerfile.source
+++ b/prysm/Dockerfile.source
@@ -48,8 +48,6 @@ RUN adduser \
     --uid "${UID}" \
     "${USER}"
 
-# Create mount point for old volume
-RUN mkdir -p /var/lib/prysm-og && chown -R ${USER}:${USER} /var/lib/prysm-og
 # Create data mount point with permissions
 RUN mkdir -p /var/lib/prysm/ee-secret && chown -R ${USER}:${USER} /var/lib/prysm && chmod -R 700 /var/lib/prysm && chmod 777 /var/lib/prysm/ee-secret
 
diff --git a/prysm/docker-entrypoint.sh b/prysm/docker-entrypoint.sh
index 47c6cbc5..cef6342a 100755
--- a/prysm/docker-entrypoint.sh
+++ b/prysm/docker-entrypoint.sh
@@ -6,16 +6,6 @@ if [ "$(id -u)" = '0' ]; then
   exec gosu prysmconsensus docker-entrypoint.sh "$@"
 fi
 
-# Migrate from old to new volume
-if [[ -d /var/lib/prysm-og && ! -f /var/lib/prysm-og/migrationdone \
-    && $(ls -A /var/lib/prysm-og/) ]]; then
-  echo "Migrating from old Prysm volume to new one"
-  echo "This may take 10 minutes on a fast drive. Please be patient"
-  rsync -a --remove-source-files --exclude='ee-secret' /var/lib/prysm-og/ /var/lib/prysm/
-  touch /var/lib/prysm-og/migrationdone
-  echo "Migration completed, data is now in volume \"prysmconsensus-data\""
-fi
-
 if [ -n "${JWT_SECRET}" ]; then
   echo -n "${JWT_SECRET}" > /var/lib/prysm/ee-secret/jwtsecret
   echo "JWT secret was supplied in .env"