From 40aac3bafe80c63ab1657619b807afda21fd8a58 Mon Sep 17 00:00:00 2001
From: hirunda <mdmdavor@gmail.com>
Date: Mon, 7 Nov 2022 15:48:20 +0100
Subject: [PATCH 1/5] [DO NOT MERGE]

Changed hardfork time for testing purposes

on 2022 11 06
---
 libraries/chain/hardfork.d/SIDECHAIN.hf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/hardfork.d/SIDECHAIN.hf b/libraries/chain/hardfork.d/SIDECHAIN.hf
index 3a0a3990..435a3315 100644
--- a/libraries/chain/hardfork.d/SIDECHAIN.hf
+++ b/libraries/chain/hardfork.d/SIDECHAIN.hf
@@ -1,7 +1,7 @@
 #ifndef HARDFORK_SIDECHAIN_DELETE_TIME
 #ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
+#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-06T02:00:00"))
 #else
-#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
+#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-06T02:00:00"))
 #endif
 #endif
-- 
2.45.2


From f08a36cca21ce8fedc04e944695fec7991a4b4a7 Mon Sep 17 00:00:00 2001
From: Rily Dunlap <rilydunlap@outlook.com>
Date: Wed, 9 Nov 2022 17:41:46 +0000
Subject: [PATCH 2/5] Update .gitlab-ci.yml - troubleshooting docker build
 failing

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cda41654..4556274b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,7 @@ dockerize-testnet:
     - docker info
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
+    - ls -a
     - docker build --no-cache -t $IMAGE .
     - docker push $IMAGE
   after_script:
-- 
2.45.2


From fbbd7c00b962ad81169c58cbdd186b50121fd61a Mon Sep 17 00:00:00 2001
From: Rily Dunlap <rilydunlap@outlook.com>
Date: Wed, 9 Nov 2022 17:50:43 +0000
Subject: [PATCH 3/5] Update .gitlab-ci.yml file - removed dependencies for
 dockerize testnet

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4556274b..70d3c97d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,8 +105,6 @@ test-testnet:
 
 dockerize-testnet:
   stage: dockerize
-  dependencies:
-    - test-testnet
   variables:
     IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
   before_script:
-- 
2.45.2


From 086269749138793ee3993bae57c93618be28ea02 Mon Sep 17 00:00:00 2001
From: Rily Dunlap <rilydunlap@outlook.com>
Date: Wed, 9 Nov 2022 17:59:00 +0000
Subject: [PATCH 4/5] Update Dockerfile - forced update of submodules

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7a76c136..c9b52077 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -92,13 +92,13 @@ RUN \
 WORKDIR /home/peerplays/
 
 ## Clone Peerplays
-#RUN \
+RUN \
 #    git clone https://gitlab.com/PBSA/peerplays.git && \
 #    cd peerplays && \
 #    git checkout develop && \
-#    git submodule update --init --recursive && \
-#    git branch --show-current && \
-#    git log --oneline -n 5
+     git submodule update --init --recursive && \
+     git branch --show-current && \
+     git log --oneline -n 5
 
 # Add local source
 ADD . peerplays
-- 
2.45.2


From 39916818608469e6989253abba4ea46cc073ec6a Mon Sep 17 00:00:00 2001
From: Rily Dunlap <rilydunlap@outlook.com>
Date: Wed, 9 Nov 2022 18:30:43 +0000
Subject: [PATCH 5/5] Update Dockerfile - added submodule updates

---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9b52077..4c27b84f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -92,13 +92,13 @@ RUN \
 WORKDIR /home/peerplays/
 
 ## Clone Peerplays
-RUN \
+#RUN \
 #    git clone https://gitlab.com/PBSA/peerplays.git && \
 #    cd peerplays && \
 #    git checkout develop && \
-     git submodule update --init --recursive && \
-     git branch --show-current && \
-     git log --oneline -n 5
+#     git submodule update --init --recursive && \
+#     git branch --show-current && \
+#     git log --oneline -n 5
 
 # Add local source
 ADD . peerplays
@@ -106,6 +106,9 @@ ADD . peerplays
 # Configure Peerplays
 RUN \
     cd peerplays && \
+    git submodule update --init --recursive && \
+    git branch --show-current && \
+    git log --oneline -n 5
     mkdir build && \
     cd build && \
     cmake -DCMAKE_BUILD_TYPE=Release ..
-- 
2.45.2