From 75d2e1945589029cf9a267653774861ad1762946 Mon Sep 17 00:00:00 2001
From: Milos Milosevic <mmilosevic@peerplays.com>
Date: Mon, 17 Apr 2023 00:34:58 +0200
Subject: [PATCH] Try via docker cp

---
 .gitlab-ci.yml | 16 ++++++++--------
 Dockerfile     |  2 --
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 142a109e..429b554b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,23 +82,23 @@ test-e2e:
     - source venv/bin/activate
     - pip3 install -r requirements.txt
     - docker ps -a
-    - docker stop $(docker ps -a -q)
-    - docker rm $(docker ps -aq)
     - python3 main.py --stop
     - docker ps -a
-    - python3 main.py --start btc hive
+    - python3 main.py --start btc hive eth
     - docker ps -a
     - python3 -m pytest test_btc_init_state.py test_hive_inital_state.py
     - docker pull registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c
     - ls -la $FULL_PWD/peerplays/config.ini
     - ls -la $FULL_PWD/peerplays/genesis.json
     - ls -la $FULL_PWD/peerplays/init-network.sh
-    - USER_ID=$(id -u)
-    - GROUP_ID=$(id -g)
-    - PP_CONTAINER_ID=$(docker run -d --user $USER_ID:$GROUP_ID -v $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/config.ini:/home/peerplays/peerplays-network/witness_node_data_dir/config.ini -v $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/genesis.json:/home/peerplays/peerplays-network/genensis.json -v $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/init-network.sh:/home/peerplays/peerplays-network/init-network.sh registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c)
-    - echo $PP_CONTAINER_ID
+    - docker run --name pp -d $IMAGE tail -f /dev/null
+    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/config.ini pp:/home/peerplays/peerplays-network/witness_node_data_dir/config.ini
+    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/genensis.json pp:/home/peerplays/peerplays-network/witness_node_data_dir/genensis.json
+    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/init-network.sh pp:/home/peerplays/peerplays-network/init-network.sh
+    - docker exec -c pp ./init-network.sh
     - docker ps -a
-    - docker exec $PP_CONTAINER_ID sh -c ./init-network.sh
+    - docker exec pp sh -c ./witness_node -d ./witness_node_data_dir --replay-blockchain
+    - docker exec pp sh -c ./init-network.sh
     - python3 -m pytest test_pp_inital_state.py
     - ./main.py --stop
     - deactivate
diff --git a/Dockerfile b/Dockerfile
index 1d45a601..ea7918de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -222,5 +222,3 @@ EXPOSE 8090
 # Peerplays P2P:
 EXPOSE 9777
 
-# Peerplays
-CMD ["./witness_node", "-d", "./witness_node_data_dir"]