A

Makefile

@@ -18,7 +18,7 @@ shell:
 
 run:
 	mkdir -p $(LOCAL_DIR) $(LOCAL_STAGING_DIR)
-	docker run --name $(ID) -v $(LOCAL_STAGING_DIR):/staging -v $(LOCAL_DIR):/home/ipfs/.ipfs $(NAME)
+	docker run --name $(ID) $(RUN_OPTIONS) -v $(LOCAL_STAGING_DIR):/staging -v $(LOCAL_DIR):/home/ipfs/.ipfs $(NAME)
 
 start:
 	docker start -ia $(ID)
@@ -36,14 +36,12 @@ ps:
 	docker ps -a
 
 public:
-	bash add_public_route $(ID) $(PUBLIC_IP) $(PUBLIC_IFACE)
 	docker exec $(ID) ipfs config Addresses.Swarm --json '[ "/ip4/0.0.0.0/tcp/40001" ]'
 	docker restart $(ID)
 
 private:
-	bash remove_public_route $(ID) $(PUBLIC_IP) $(PUBLIC_IFACE)
 	docker exec $(ID) ipfs config Addresses.Swarm --json '[ "/ip4/127.0.0.1/tcp/40001" ]'
 	docker restart $(ID)
 
 genswarmkey:
-	bash generate_swarm_key
+	bash generate_swarm_key

add_public_route

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-base="$( cd "$(dirname "$0")" ; pwd -P )"
-
-id="$1"
-public_ip="$2"
-public_iface="$3"
-
-if [ -z "$public_iface" ]; then
-    echo >&2 "usage: $0 ctid public_ip public_iface"
-    exit 1
-fi
-
-$base/remove_public_route "$id" "$public_ip" "$public_iface" || true
-
-docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $id)
-
-if [ -n "$docker_ip" ]; then
-    iptables -t nat -A PREROUTING -d $public_ip/32 -i $public_iface -j DNAT --to-destination $docker_ip
-fi
-
-exit 0

remove_public_route

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-base="$( cd "$(dirname "$0")" ; pwd -P )"
-
-id="$1"
-public_ip="$2"
-public_iface="$3"
-
-if [ -z "$public_iface" ]; then
-    echo >&2 "usage: $0 ctid public_ip public_iface"
-    exit 1
-fi
-
-docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $id)
-
-if [ -n "$docker_ip" ]; then
-    iptables -t nat -D PREROUTING -d $public_ip/32 -i $public_iface -j DNAT --to-destination $docker_ip || true
-fi
-
-exit 0