summaryrefslogtreecommitdiffstats
path: root/lava-master/Dockerfile
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-07-02 15:03:50 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-07-12 14:30:20 +0200
commit3e0ed7a2bb5f52ba54fdc1a6fbbe258f42397fbe (patch)
tree51edc1b51822ef42cf69dcc975a093bdef67638c /lava-master/Dockerfile
parenta86807eafd93f0f53933929f616ee3a73d807d7c (diff)
Add device-types and tokens at startup
This patch remove the use of setup.sh during build. So setup.sh is now ran during startup. Since setup.sh could ran multiple times (start -> stop -> start) against the same database, we need to handle already existing objects (user, devices,...) So all "add objects" are done only after a check that this object is not already present.
Diffstat (limited to 'lava-master/Dockerfile')
-rw-r--r--lava-master/Dockerfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 4407f0b..3e64627 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -77,7 +77,6 @@ COPY device-types/ /root/device-types/
COPY users/ /root/lava-users/
COPY tokens/ /root/lava-callback-tokens/
COPY scripts/setup.sh /
-RUN /start.sh && /setup.sh && /stop.sh
#uncomment if you want to use squid
# warning the address used must be network accessible by all slave