Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
Miggets7 committed Jan 31, 2019
2 parents 6744c58 + 29975e3 commit e21c8a52778fc018ca0acca80b402382f501828d
Showing with 5 additions and 0 deletions.
  1. +4 −0 manager/Dockerfile
  2. +1 −0 ui/component/rest/build.gradle
@@ -1,6 +1,10 @@
FROM debian:stretch
MAINTAINER support@openremote.io

# 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 \
@@ -12,6 +12,7 @@ buildscript {
}

dependencies {
compile resolveProject(":model")
compile 'cz.habarta.typescript-generator:typescript-generator-core:2.9.456'
}

0 comments on commit e21c8a5

Please sign in to comment.