Update Dockerfile - added submodule updates

Update Dockerfile - forced update of submodules
Update .gitlab-ci.yml file - removed dependencies for dockerize testnet
2022-11-09 18:30:43 +00:00 · 2022-11-09 17:59:00 +00:00 · 2022-11-09 17:50:43 +00:00 · 2022-11-09 17:41:46 +00:00 · 2022-11-07 15:48:20 +01:00
3 changed files with 9 additions and 7 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -105,14 +105,13 @@ test-testnet:

 dockerize-testnet:
  stage: dockerize
-  dependencies:
-    - test-testnet
  variables:
    IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
  before_script:
    - 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:
--- a/9
+++ b/9
@ -96,9 +96,9 @@ WORKDIR /home/peerplays/
 #    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 ..
--- 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
Author	SHA1	Message	Date
Rily Dunlap	3991681860	Update Dockerfile - added submodule updates	2022-11-09 18:30:43 +00:00
Rily Dunlap	0862697491	Update Dockerfile - forced update of submodules	2022-11-09 17:59:00 +00:00
Rily Dunlap	fbbd7c00b9	Update .gitlab-ci.yml file - removed dependencies for dockerize testnet	2022-11-09 17:50:43 +00:00
Rily Dunlap	f08a36cca2	Update .gitlab-ci.yml - troubleshooting docker build failing	2022-11-09 17:41:46 +00:00
hirunda	40aac3bafe	[DO NOT MERGE] Changed hardfork time for testing purposes on 2022 11 06	2022-11-07 15:48:20 +01:00