tweaked lbrynet docker stuff

lbrynet/Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:18.04
 LABEL MAINTAINER="leopere [at] nixc [dot] us"
 
-RUN apt-get update && apt-get -y install unzip
+RUN apt-get update && apt-get -y install unzip && apt-get install -y ca-certificates
 RUN adduser lbrynet --gecos GECOS --shell /bin/bash --disabled-password --home /lbrynet/
 
 ## Add lbrynet
@@ -16,13 +16,14 @@ RUN unzip /lbrynet/lbrynet.linux.zip -d /lbrynet/ && \
 COPY stuff/start.sh /usr/local/bin/start
 COPY stuff/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY stuff/healthcheck.sh /usr/local/bin/healthcheck
+COPY stuff/daemon_settings.yml /lbrynet/daemon_settings.yml
 
 ## Daemon port [Intended for internal use]
 ## LBRYNET talks to peers on port 3333 [Intended for external use] this port is used to discover other lbrynet daemons with blobs.
 ## Expose 5566 Reflector port to listen on
 ## Expose 5279 Port the daemon API will listen on
 ## the lbryumx aka Wallet port [Intended for internal use]
-EXPOSE 4444 3333 5566 5279 50001
+#EXPOSE 4444 3333 5566 52800 50001
 
 
 
@@ -32,7 +33,7 @@ EXPOSE 4444 3333 5566 5279 50001
 # VOLUME /lbrynet/.local/
 
 ## Example daemon_settings.yml is at https://github.com/lbryio/lbry/blob/master/example_daemon_settings.yml
-ADD https://raw.githubusercontent.com/lbryio/lbry/master/example_daemon_settings.yml /etc/lbrynet/example_daemon_settings.yml
+##ADD https://raw.githubusercontent.com/lbryio/lbry/master/example_daemon_settings.yml /etc/lbrynet/example_daemon_settings.yml
 ## TODO: In start.sh detect and merge changes.
 # VOLUME /etc/lbry/daemon_settings.yml
 

lbrynet/docker-compose.yml

@@ -1,25 +1,13 @@
 version: '3.4'
 
-networks:
-  lbry-network:
-    external: true
-
 services:
 #############
 ## Lbrynet ##
 #############
   lbrynet:
     build: .
-    restart: always
-    ## TODO: Does this container ever need a static network address or is it better to be dynamic?
-    networks:
-      # lbrynet:
-      #   ipv4_address: 10.6.1.4
-      - lbry-network
-    labels:
-      - "traefik.expose=false"
-    ## TODO: Verify the need for the following port binds on host networking.
     ports:
+      - 5280:52800
       - 4444:4444
       - 50001:50001
     ## host volumes for persistent data such as wallet private keys.

lbrynet/stuff/daemon_settings.yml

@@ -0,0 +1,16 @@
+share_usage_data: True
+
+lbryum_servers:
+  - lbryumx1.lbry.io:50001
+  - lbryumx2.lbry.io:50001
+
+blockchain_name: lbrycrd_main
+
+data_dir: /home/lbry/.lbrynet
+download_directory: /home/lbry/downloads
+
+delete_blobs_on_remove: True
+dht_node_port: 4444
+port: 5280
+peer_port: 3333
+use_upnp: True

lbrynet/stuff/start.sh

@@ -14,4 +14,4 @@ chmod -R 755 /lbrynet
 # chmod -R 755 /etc/lbrynet
 # rm -f /var/run/lbrynet.pid
 
-su -c "lbrynet start" lbrynet
+su -c "lbrynet start --api localhost:5280"