More moving and deletions

lbrycrd/compose/docker-compose.yml-prod-example

@@ -14,8 +14,6 @@ services:
     networks:
       lbry-network:
         ipv4_address: 10.6.1.2
-    labels:
-      - "traefik.expose=false"
     environment:
       RUN_MODE: chainquery
     env_file:
@@ -25,4 +23,4 @@ services:
       - 9246
     ## host volumes for persistent data such as wallet private keys.
     volumes:
-      - "./data:/data"
+      - "../persist/data:/data"

lbrycrd/linux-x86_64-compiler/Dockerfile

@@ -48,7 +48,7 @@ RUN adduser lbrycrd --gecos GECOS --shell /bin/bash --disabled-password --home /
 ## This needn't be included until debugpaste is ready.
 # COPY debugpaste-it.sh /usr/local/bin/debugpaste-it
 # COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
-COPY start.sh /usr/local/bin/start
+COPY ../stuff/start.sh /usr/local/bin/start
 
 
 USER lbrycrdd

lbrycrd/linux-x86_64-compiler/docker-entrypoint.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# default to run whatever the user wanted like "/bin/bash"
-## If user runs no need to run any more of the entrypoint script.
-if [[ -z "$@" ]]; then
-  echo "User did not attempt input. Now executing docker-entrypoint."
-else
-  echo "Running $@."
-  exec "$@"
-  exit 1
-fi
-
-/bin/bash

lbrycrd/linux-x86_64-compiler/start.sh

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-# ## ToDo:
-# ## Get a test case to see if this is the first run or a repeat run
-# ## If it's a first run you need to do a full index including all transactions
-# ## tx index creates an index of every single transaction in the block history if
-# ## not specified it will only create an index for transactions that are related to the wallet or have unspent outputs.
-# ## This is specific to chainquery.
-
-## Ensure perms are correct prior to running main binary
-mkdir -p /data/.lbrycrd
-chown -R 1000:1000 /data
-chmod -R 755 /data
-# chown -R 1000:1000 /etc/lbrycrdd
-# chmod -R 755 /etc/lbrycrdd
-rm -f /var/run/lbrycrdd.pid
-
-## Set config params
-echo 'rpcuser=lbryrpc\nrpcpassword='${RPC_PASSWORD:-changeme} > ~/.lbrycrd/lbrycrd.conf
-echo "rpcallowip=${RPC_ALLOW_IP:-10.6.1.3}" >> ~/.lbrycrd/lbrycrd.conf
-echo "rpcuser=${RPC_USER:-lbryrpc}" >> ~/.lbrycrd/lbrycrd.conf
-
-## Control this invocation through envvar.
-case ${RUN_MODE:-default} in
-  default )
-    lbrycrdd \
-      -server \
-      -conf=$HOME/.lbrycrd/lbrycrd.conf \
-      -printtoconsole
-    ;;
-  reindex )
-    lbrycrdd \
-      -server \
-      -txindex \
-      -reindex \
-      -conf=$HOME/.lbrycrd/lbrycrd.conf \
-      -printtoconsole
-    ;;
-  chainquery )
-    lbrycrdd \
-      -server \
-      -txindex \
-      -conf=$HOME/.lbrycrd/lbrycrd.conf \
-      -printtoconsole
-    ;;
-esac
-
-
-## We were unsure if these function as intended so they were disabled for the time being.
-#  -port=${PORT:-9246} \
-#  -data=${DATA_DIR:-/data/} \
-#  -pid=${PID_FILE:/var/run/lbrycrdd.pid} \
-#  -rpcport=${RPC_PORT:-9245} \
-#  -rpcpassword=${RPC_PASSWORD:-changeme} \
-#  -rpcuser=${RPC_USER:-lbryrpc} \
-#  -rpcallowip=${RPC_ALLOW_IP:-10.6.1.3}