From ad0e9a55b7a0cf25b0cc9c4967d6a0e2d0a90427 Mon Sep 17 00:00:00 2001 From: Ray Ozzie Date: Tue, 22 Mar 2016 15:46:08 -0700 Subject: [PATCH] xxx --- Dockerfile | 6 ++---- Dockerfile~ | 7 +++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d459f50..a76eea6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,7 @@ FROM resin/raspberrypi-buildpack-deps ENV INITSYSTEM on # Copy the installer -run pwd -# COPY . ~/ttn-gateway -COPY ./resin-install.sh ~/ttn-gateway +COPY /resin-install.sh ~/ttn-gateway # Build the gateway WORKDIR ~/ttn-gateway @@ -14,7 +12,7 @@ RUN ./resin-install.sh # Make sure we start up within the bin directory WORKDIR /opt/ttn-gateway/bin -COPY ./resin-run.sh /opt/ttn-gateway/bin/resin-run.sh +COPY /resin-run.sh ./resin-run.sh # Start it up CMD ["sh", "-c", "./resin-run.sh"] diff --git a/Dockerfile~ b/Dockerfile~ index 08635ee..d459f50 100644 --- a/Dockerfile~ +++ b/Dockerfile~ @@ -3,8 +3,10 @@ FROM resin/raspberrypi-buildpack-deps # Enable systemd ENV INITSYSTEM on -# Copy all the source code to the place where golang will find it -COPY . ~/ttn-gateway +# Copy the installer +run pwd +# COPY . ~/ttn-gateway +COPY ./resin-install.sh ~/ttn-gateway # Build the gateway WORKDIR ~/ttn-gateway @@ -12,6 +14,7 @@ RUN ./resin-install.sh # Make sure we start up within the bin directory WORKDIR /opt/ttn-gateway/bin +COPY ./resin-run.sh /opt/ttn-gateway/bin/resin-run.sh # Start it up CMD ["sh", "-c", "./resin-run.sh"]