Skip to content

armgit / core

Public Imported from GitHub
0

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

Copgeo LitElement

robindekkersa434ad31e858
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 360823f90..4fb0d2d20 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -27,7 +27,7 @@ RUN ln -svT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" /docker-j
ENV JAVA_HOME /docker-java-home
ENV JAVA_VERSION 8u181
-ENV JAVA_DEBIAN_VERSION 8u181-b13-1~deb9u1
+ENV JAVA_DEBIAN_VERSION 8u181-b13-2~deb9u1
# see https://bugs.debian.org/775775
# and https://github.com/docker-library/java/issues/19#issuecomment-70546872
diff --git a/manager/Dockerfile b/manager/Dockerfile
index dc4b77dbb..3e933b321 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -27,7 +27,7 @@ RUN ln -svT "/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)" /docker-j
ENV JAVA_HOME /docker-java-home
ENV JAVA_VERSION 8u181
-ENV JAVA_DEBIAN_VERSION 8u181-b13-1~deb9u1
+ENV JAVA_DEBIAN_VERSION 8u181-b13-2~deb9u1
# see https://bugs.debian.org/775775
# and https://github.com/docker-library/java/issues/19#issuecomment-70546872
diff --git a/project.gradle b/project.gradle
index 25c14b072..79dc438db 100644
--- a/project.gradle
+++ b/project.gradle
@@ -79,6 +79,13 @@ ext.nodeModuleLocal = {
file("${projectDir}/node_modules/${dir}/bin/${mod}")
}
+task npmInstall(overwrite: true, type: NpmTask, dependsOn: 'npmSetup') {
+ inputs.file('package.json')
+ outputs.upToDateWhen { file('node_modules').exists() }
+
+ npmCommand = ['install']
+}
+
// Add bower tasks
task bowerInstall(type: NpmTask) {
dependsOn nodeSetup