Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Minor gradle and docker updates

Rich Turner29975e37316f
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 66fab32f7..bead4d117 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -1,6 +1,10 @@
FROM debian:stretch
MAINTAINER [email protected]
+# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadad
+ARG GIT_COMMIT=unknown
+LABEL git-commit=$GIT_COMMIT
+
# Install curl, wget, ca-certificates, procps
RUN apt-get update && apt-get install -y --no-install-recommends \
procps \
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
index 33a2af46a..ba2608062 100644
--- a/ui/component/rest/build.gradle
+++ b/ui/component/rest/build.gradle
@@ -12,6 +12,7 @@ buildscript {
}
dependencies {
+ compile resolveProject(":model")
compile 'cz.habarta.typescript-generator:typescript-generator-core:2.9.456'
}