Skip to content
Permalink
Browse files

Switched dockerize version to avoid high cpu load

  • Loading branch information...
bwo
bwo committed Mar 22, 2019
1 parent 67917e8 commit c2041bd7069ec8350e01a67d9f7e14912ebd21c0
Showing with 13 additions and 15 deletions.
  1. +2 −4 Dockerfile
  2. +11 −11 docker/templates/osm-config.yml.j2
@@ -3,15 +3,13 @@ FROM java:openjdk-8
ENV OSM_HOME /osm
ENV OSM_CONFIG_HOME /osm/config
ENV JAVA_OPTS "-server -Dgrails.env=prod -Dfile.encoding=UTF-8"
ENV DOCKERIZE_VERSION v0.3.0
ENV DOCKERIZE_VERSION v0.11.0

# add osm-user
RUN groupadd -r osm && useradd -ms /bin/bash -r -g osm osm

# install dockerize
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
RUN wget -O - https://github.com/powerman/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-`uname -s`-`uname -m` | install /dev/stdin /bin/dockerize

# get osm-sources and build war-file
RUN mkdir -p $OSM_HOME $OSM_HOME/logs $OSM_CONFIG_HOME && \
@@ -14,24 +14,24 @@ grails:
osm:
security:
initialOsmAdminUser:
username: '{{ default .Env.OSM_ADMIN_USER "admin" }}'
password: '{{ default .Env.OSM_ADMIN_PASSWORD "secret123" }}'
username: '{{ default "admin" .Env.OSM_ADMIN_USER }}'
password: '{{ default "secret123" .Env.OSM_ADMIN_PASSWORD }}'
initialOsmRootUser:
username: '{{ default .Env.OSM_ROOT_USER "root" }}'
password: '{{ default .Env.OSM_ROOT_PASSWORD "muchMoreSecret!123" }}'
username: '{{ default "root" .Env.OSM_ROOT_USER }}'
password: '{{ default "muchMoreSecret!123" .Env.OSM_ROOT_PASSWORD }}'

environments:
production:
grails:
serverURL: '{{ default .Env.OSM_URL "http://localhost:8080"}}'
serverURL: '{{ default "http://localhost:8080" .Env.OSM_URL }}'
de.iteratec.osm.detailAnalysis:
enablePersistenceOfDetailAnalysisData: {{ default .Env.ENABLE_DETAIL_ANALYSIS "false" }}
microserviceUrl: '{{ default .Env.DETAIL_ANALYSIS_URL "http://your.detail.analysis.service.com" }}'
apiKey: '{{ default .Env.API_KEY_DETAIL_ANALYSIS "apiKeyForDetailAnalysisService" }}'
enablePersistenceOfDetailAnalysisData: {{ default "false" .Env.ENABLE_DETAIL_ANALYSIS }}
microserviceUrl: '{{ default "http://your.detail.analysis.service.com" .Env.DETAIL_ANALYSIS_URL }}'
apiKey: '{{ default "apiKeyForDetailAnalysisService" .Env.API_KEY_DETAIL_ANALYSIS }}'
dataSource:
url: 'jdbc:mysql://{{ default .Env.MYSQL_HOST "osm-mysql" }}/{{ default .Env.MYSQL_DATABASE "osm" }}'
username: '{{ default .Env.MYSQL_USER "osm" }}'
password: '{{ default .Env.MYSQL_PASSWORD "osm123" }}'
url: 'jdbc:mysql://{{ default "osm-mysql" .Env.MYSQL_HOST }}/{{ default "osm" .Env.MYSQL_DATABASE }}'
username: '{{ default "osm" .Env.MYSQL_USER }}'
password: '{{ default "osm123" .Env.MYSQL_PASSWORD }}'
dbCreate: "managed by liquibase"
pooled: true
properties:

0 comments on commit c2041bd

Please sign in to comment.
You can’t perform that action at this time.