docker-compose, cleanup Dockerfile & add validator.env.dist

Author: elpiel

Dockerfile

@@ -32,20 +32,14 @@ ENV SENTRY_URL=
 # default: `infinite`
 ENV SINGLE_TICK=
 
-RUN echo ${KEYSTORE_FILE:+-k $KEYSTORE_FILE} ${SENTRY_URL:+-u $SENTRY_URL}
-
 WORKDIR /usr/local/bin
 
 RUN apt update && apt-get install -y libssl-dev
 
 COPY --from=builder /usr/local/bin/validator_worker .
 
-ENTRYPOINT [ \
-    "sh", "-c", \
-    "validator_worker", \
-    "-a", "${ADAPTER:-ethereum}", \
-    "${DUMMY_IDENTITY:+-i $DUMMY_IDENTITY}", \
-    "${KEYSTORE_FILE:+-k $KEYSTORE_FILE}", \
-    "${SINGLE_TICK:+-t}", \
-    "${SENTRY_URL:+-u $SENTRY_URL}", "${CONFIG}" \
-]
+ENTRYPOINT validator_worker -a ${ADAPTER:-ethereum} \
+            ${KEYSTORE_FILE:+-k $KEYSTORE_FILE} \
+            ${DUMMY_IDENTITY:+-i $DUMMY_IDENTITY} \
+            ${SINGLE_TICK:+-t} \
+            ${SENTRY_URL:+-u $SENTRY_URL} ${CONFIG}

docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.7'
+
+services:
+  validator:
+    build: .
+    container_name: 'adex-network-validator'
+    restart: always
+    # For Ethereum adapter
+    #volumes:
+    #  - "/root/keystore.json:/app/keystore.json"
+    env_file:
+      - validator.env

validator.env.dist

@@ -0,0 +1,6 @@
+SENTRY_URL=http://localhost:8005
+ADAPTER=dummy
+DUMMY_IDENTITY=ce07CbB7e054514D590a0262C93070D838bFBA2e
+# for Ethereum adapter
+#KEYSTORE_FILE="/app/keystore.json"
+#KEYSTORE_PWD="adexvalidator"