rearrange files

This commit is contained in:
Ray Ozzie 2016-03-29 18:27:49 -04:00
parent 597e3006d8
commit b8288da4a8
3 changed files with 16 additions and 11 deletions

View File

@ -8,14 +8,12 @@ ENV INITSYSTEM on
# and thus forces a full rebuild. Not used outside of Dockerfile.) # and thus forces a full rebuild. Not used outside of Dockerfile.)
ENV TTN_GATEWAY_SOFTWARE 48 ENV TTN_GATEWAY_SOFTWARE 48
# Build the gateway # Copy the build and run environment
COPY build.sh /opt/ttn-gateway/dev/build.sh COPY . /opt/ttn-gateway/
WORKDIR /opt/ttn-gateway/dev WORKDIR /opt/ttn-gateway/
RUN ./build.sh && rm -rf /opt/ttn-gateway/dev
# Copy the run shell script after build, so we can modify it without rebuilding # Build the gateway (or comment this out if debugging on-device)
COPY run.sh /opt/ttn-gateway/run.sh RUN ./dev/build.sh && rm -rf ./dev
WORKDIR /opt/ttn-gateway
# Start it up # Start it up
CMD ["sh", "-c", "./run.sh"] CMD ["sh", "-c", "./run.sh"]

View File

@ -65,7 +65,7 @@ popd
popd popd
# Copy things needed at runtime to where they'll be expected # Copy things needed at runtime to where they'll be expected
cp $BUILD_DIR/packet_forwarder/reset_pkt_fwd.sh $INSTALL_DIR/reset_pkt_fwd.sh cp $BUILD_DIR/packet_forwarder/reset_pkt_fwd.sh $INSTALL_DIR/set-gateway-id.sh
cp $BUILD_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd $INSTALL_DIR/poly_pkt_fwd cp $BUILD_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd $INSTALL_DIR/ttn-gateway
echo "Build & Installation Completed." echo "Build & Installation Completed."

11
run.sh
View File

@ -1,5 +1,12 @@
#! /bin/bash #! /bin/bash
# Exit if we're debugging and haven't yet built the gateway
if [ ! -f "ttn-gateway" ]; then
echo "ERROR: gateway executable not yet built"
exit 1
fi
# We need to be online, wait if needed. # We need to be online, wait if needed.
while [[ $(ping -c1 google.com 2>&1 | grep " 0% packet loss") == "" ]]; do while [[ $(ping -c1 google.com 2>&1 | grep " 0% packet loss") == "" ]]; do
@ -153,7 +160,7 @@ echo -e "{\n\
# Set gateway_ID in local_conf.json to the gateway's MAC address # Set gateway_ID in local_conf.json to the gateway's MAC address
echo "******************" echo "******************"
./reset_pkt_fwd.sh start ./local_conf.json ./set-gateway-id.sh start ./local_conf.json
echo "******************" echo "******************"
echo "" echo ""
@ -172,7 +179,7 @@ sleep 0.1
while true while true
do do
echo "[TTN Gateway]: Starting packet forwarder..." echo "[TTN Gateway]: Starting packet forwarder..."
./poly_pkt_fwd ./ttn-gateway
echo "******************" echo "******************"
echo "*** [TTN Gateway]: EXIT (retrying in 15s)" echo "*** [TTN Gateway]: EXIT (retrying in 15s)"
echo "******************" echo "******************"