Merge pull request #3 from dabelenda/make_sure_jvm_options_are_passed

Make sure jvm options are passed

.bumpversion.cfg

@@ -1,10 +1,11 @@
 [bumpversion]
-current_version = 2.3.9
+current_version = 2.3.10
 commit = True
 tag = True
 tag_name = {new_version}
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?
 
 [bumpversion:file:README.md]
 
-[bumpversion:file:docker/README.md]
+[bumpversion:file:docker/runner/README.md]
+

Dockerfile

@@ -16,6 +16,7 @@ COPY .circleci/ /build/.circleci/
 COPY tests/ /build/tests/
 COPY docker/ /build/docker/
 COPY docs/ /build/docs/
+COPY dev/ /build/dev/
 COPY .*.cfg .*ignore .*.yaml .*.conf .gitattributes *.md *.sh *.yml *.json *.txt Dockerfile LICENSE /build/
 
 RUN /check-sources.sh

README.md

@@ -16,7 +16,7 @@ It relies on a runtime environment containing [Mesos](http://mesos.apache.org) a
 
 ```sh
 
- docker run --rm --env [list of environment variables] --link woken hbpmip/woken:2.3.9
+ docker run --rm --env [list of environment variables] --link woken hbpmip/woken:2.3.10
 
 ```
 

build.sbt

@@ -26,12 +26,12 @@ lazy val `woken` =
           library.akkaHttpJson,
           library.kamon,
           library.kamonAkka,
-          //library.kamonAkkaHttp,
-          //library.kamonAkkaRemote,
+          library.kamonAkkaHttp,
+          library.kamonAkkaRemote,
           library.kamonPrometheus,
           library.kamonZipkin,
           library.kamonSystemMetrics,
-          //library.kamonSigar,
+          library.kamonSigar,
           library.akkaHttpSwagger,
           library.swaggerJaxrs,
           library.swaggerUI,
@@ -101,12 +101,12 @@ lazy val library =
       val kittens         = "1.0.0-RC2"
       val catsScalaTest   = "2.3.1"
       val config          = "1.2.1"
-      val doobie          = "0.5.0"
+      val doobie          = "0.5.1"
       val snakeyaml       = "1.17"
       val hadrian         = "0.8.5"
       val scalaCache      = "0.21.0"
       val dockerTestKit   = "0.9.5"
-      val wokenMessages   = "2.5.1"
+      val wokenMessages   = "2.5.2"
     }
     object ExclusionRules {
       val excludeLogback = ExclusionRule(organization = "ch.qos.logback", name = "logback-classic")

dev/README.md

@@ -0,0 +1,3 @@
+## Woken development
+
+Scripts in this directory should help a developer to setup an environment for fast development/debugging of Woken.

dev/docker-compose.yml

@@ -0,0 +1,305 @@
+# Configuration taken from https://github.com/meltwater/docker-mesos
+# https://github.com/containous/traefik/blob/master/examples/compose-marathon.yml
+
+version: '3.0'
+
+services:
+  zookeeper:
+    image: zookeeper:3.4.11
+    hostname: zookeeper
+    ports:
+      - '2181:2181'
+      - '2888:2888'
+      - '3888:3888'
+    environment:
+      ZOO_MY_ID: 1
+      ZOO_SERVERS: server.1=zookeeper:2888:3888
+    restart: always
+
+  wait_zookeeper:
+    image: "waisbrot/wait"
+    restart: "no"
+    environment:
+      TARGETS: "zookeeper:2181"
+      TIMEOUT: 60
+    depends_on:
+      - zookeeper
+
+  mesos_master:
+    image: mesosphere/mesos-master:1.3.0
+    hostname: mesosmaster
+    volumes:
+      - ./log/mesos/master:/var/log/mesos/master:rw
+      - ./tmp/mesos/master:/var/tmp/mesos:rw
+    environment:
+      MESOS_PORT: 5050
+      MESOS_ZK: 'zk://zookeeper:2181/mesos'
+      MESOS_QUORUM: '1'
+      MESOS_REGISTRY: 'in_memory'
+      MESOS_CLUSTER: 'local'
+      MESOS_HOSTNAME: 'mesosmaster.docker'
+      MESOS_LOG_DIR: '/var/log/mesos/master'
+      MESOS_WORK_DIR: '/var/lib/mesos'
+    depends_on:
+      - zookeeper
+
+  wait_mesos_master:
+    image: "waisbrot/wait"
+    restart: "no"
+    environment:
+      TARGETS: "mesos_master:5050"
+      TIMEOUT: 60
+    depends_on:
+      - mesos_master
+
+  mesos_slave:
+    image: mesosphere/mesos-slave:1.3.0
+    hostname: mesosslave
+    privileged: true
+    volumes:
+      - ./log/mesos/slave:/var/log/mesos/slave:rw
+      - ./tmp/mesos/slave:/var/tmp/mesos:rw
+      - /sys:/sys
+      #- /cgroup:/cgroup is it really needed for the demo? Not compatible with docker machine on MacOSX, try /sys/fs/cgroups...
+      # /usr/bin/docker is needed if you're running an older docker version
+      #- /usr/bin/docker:/usr/bin/docker:r
+      - /var/run/docker.sock:/var/run/docker.sock:rw
+    environment:
+      MESOS_MASTER: 'zk://zookeeper:2181/mesos'
+      MESOS_PORT: '5051'
+      MESOS_LOG_DIR: '/var/log/mesos/slave'
+      MESOS_WORK_DIR: '/var/tmp/mesos'
+      MESOS_CONTAINERIZERS: 'docker,mesos'
+      MESOS_EXECUTOR_REGISTRATION_TIMEOUT: '5mins'
+      MESOS_EXECUTOR_SHUTDOWN_GRACE_PERIOD: '90secs'
+      MESOS_DOCKER_STOP_TIMEOUT: '60secs'
+      # If your workstation doesn't have a resolvable hostname/FQDN then $MESOS_HOSTNAME needs to be set to its IP-address
+      MESOS_HOSTNAME: 'mesosslave.docker'
+      MESOS_SWITCH_USER: 0
+      # see bug resolution for "Failed to determine the hierarchy where the subsystem freezer is attached" at https://github.com/eBayClassifiedsGroup/PanteraS/issues/142
+      MESOS_LAUNCHER: "posix"
+    depends_on:
+      - zookeeper
+      - mesos_master
+
+  chronos:
+    image: mesosphere/chronos:v3.0.2
+    command: '--zk_hosts zookeeper:2181 --master zk://zookeeper:2181/mesos --zk_timeout 30000'
+    restart: "always"
+    hostname: chronos
+    ports:
+      - "4400:4400"
+      - "4401:4401"
+    environment:
+      PORT0: 4400
+      PORT1: 4401
+    depends_on:
+      - zookeeper
+      - mesos_slave
+
+  wait_chronos:
+    image: "waisbrot/wait"
+    restart: "no"
+    environment:
+      TARGETS: "chronos:4400"
+      TIMEOUT: 60
+    depends_on:
+      - chronos
+
+  # Expose the database to the host
+  db:
+    image: postgres:9.6.5-alpine
+    ports:
+      - "5432:5432"
+    hostname: db
+    environment:
+      POSTGRES_PASSWORD: test
+
+  wait_dbs:
+    image: "waisbrot/wait"
+    restart: "no"
+    environment:
+      TARGETS: "db:5432"
+      TIMEOUT: 60
+    depends_on:
+      - db
+
+  create_dbs:
+    image: "hbpmip/create-databases:1.0.0"
+    restart: "no"
+    environment:
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_ADMIN_USER: postgres
+      DB_ADMIN_PASSWORD: test
+      DB1: meta
+      USER1: meta
+      PASSWORD1: metapwd
+      DB2: features
+      USER2: features
+      PASSWORD2: featurespwd
+      DB3: woken
+      USER3: woken
+      PASSWORD3: wokenpwd
+      DB4: portal
+      USER4: portal
+      PASSWORD4: portalpwd
+    depends_on:
+      - db
+
+  sample_meta_db_setup:
+    image: "hbpmip/sample-meta-db-setup:0.4.4"
+    container_name: "sample-meta-db-setup"
+    restart: "no"
+    environment:
+      FLYWAY_HOST: db
+      FLYWAY_PORT: 5432
+      FLYWAY_DATABASE_NAME: meta
+      FLYWAY_USER: postgres
+      FLYWAY_PASSWORD: test
+    depends_on:
+      - db
+
+  sample_data_db_setup:
+    image: "hbpmip/sample-data-db-setup:0.5.0"
+    container_name: "sample-data-db-setup"
+    restart: "no"
+    environment:
+      FLYWAY_HOST: db
+      FLYWAY_PORT: 5432
+      FLYWAY_DATABASE_NAME: features
+      FLYWAY_USER: postgres
+      FLYWAY_PASSWORD: test
+    depends_on:
+      - db
+
+  woken_db_setup:
+    image: "hbpmip/woken-db-setup:1.0.2"
+    container_name: "woken-db-setup"
+    restart: "no"
+    environment:
+      FLYWAY_HOST: db
+      FLYWAY_PORT: 5432
+      FLYWAY_DATABASE_NAME: woken
+      FLYWAY_USER: postgres
+      FLYWAY_PASSWORD: test
+    depends_on:
+      - db
+
+  woken:
+    image: hbpmip/woken
+    volumes:
+      - ./woken/config:/opt/woken/config
+    ports:
+      - "8087:8087"
+      - "8088:8088"
+      - "9095:9095"
+      - "8000:8000"
+    environment:
+      CLUSTER_PORT: 8088
+      CLUSTER_IP: woken
+      WOKEN_PORT_8088_TCP_ADDR: woken
+      DOCKER_BRIDGE_NETWORK: "tests_default"
+      LOG_LEVEL: DEBUG
+      KAMON_ENABLED: "no"
+      ZIPKIN_ENABLED: "yes"
+      PROMETHEUS_ENABLED: "yes"
+      SIGAR_SYSTEM_METRICS: "no"
+      JVM_SYSTEM_METRICS: "no"
+      JAVA_OPTS: "-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
+    links:
+      - zipkin
+      - wokenprometheus
+    depends_on:
+      - chronos
+      - db
+
+  wokenvalidation:
+    image: hbpmip/woken-validation:2.2.16
+    ports:
+      - "8081:8081"
+      - "8082:8082"
+    environment:
+      CLUSTER_PORT: 8082
+      CLUSTER_IP: wokenvalidation
+      WOKEN_PORT_8088_TCP_ADDR: "${HOST}"
+      LOG_LEVEL: DEBUG
+
+  wait_woken:
+    image: "waisbrot/wait"
+    restart: "no"
+    environment:
+      TARGETS: "${HOST}:8087,chronos:4400,wokenvalidation:8081"
+      TIMEOUT: 600
+    depends_on:
+      - woken
+      - chronos
+
+  portalbackend:
+    image: "hbpmip/portal-backend:2.6.2"
+    restart: "no"
+    ports:
+      - "65440:8080"
+      - "8089:8089"
+    environment:
+      PORTAL_DB_URL: jdbc:postgresql://db:5432/portal
+      PORTAL_DB_SERVER: db:5432
+      PORTAL_DB_USER: portal
+      PORTAL_DB_PASSWORD: portalpwd
+      META_DB_URL: jdbc:postgresql://db:5432/meta
+      META_DB_SERVER: db:5432
+      META_DB_USER: meta
+      META_DB_PASSWORD: metapwd
+      FEATURES_DB_URL: jdbc:postgresql://db:5432/features
+      FEATURES_DB_SERVER: db:5432
+      FEATURES_DB_USER: features
+      FEATURES_DB_PASSWORD: featurespwd
+      FEATURES_DB_MAIN_TABLE: cde_features_a
+      CONTEXT_PATH: /services
+      AUTHENTICATION: 0
+      FRONTEND_LOGIN_URL: http://frontend/services/login/hbp
+      FRONTEND_AFTER_LOGIN_URL: http://frontend/home
+      FRONTEND_AFTER_LOGOUT_URL: http://frontend/services/login/hbp
+      CLUSTER_IP: portalbackend
+      CLUSTER_PORT: 8089
+      WOKEN_PORT_8088_TCP_ADDR: woken
+      WOKEN_PORT_8088_TCP_PORT: 8088
+      WOKEN_AKKA_PATH: "/user/entrypoint"
+      EXAREME_URL: http://prozac.madgik.di.uoa.gr:9090/mining/query
+      LOGGING_LEVEL_WEB: DEBUG
+      LOGGING_LEVEL_HIBERNATE: WARN
+      SESSION_TIMEOUT: 2592000
+      DATASETS: desd-synthdata
+    depends_on:
+      - db
+
+  wait_portal_backend:
+    image: "waisbrot/wait"
+    restart: "no"
+    environment:
+      - TARGETS=portalbackend:8080
+    depends_on:
+      - portalbackend
+
+  frontend:
+    image: hbpmip/portal-frontend
+    depends_on:
+      - portalbackend
+    ports:
+      - "80:80"
+    environment:
+      WORKER_PROCESSES: 1
+      ERROR_LOG_LEVEL: warn
+      PORTAL_VIRTUAL_HOST: frontend
+      PORTAL_BACKEND_SERVER: portalbackend:8080
+      PORTAL_BACKEND_CONTEXT: services
+      MODE: local
+      INSTANCE_NAME: DEV
+      VERSION: 2.7.0
+
+networks:
+  default:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.18.1.0/16