base java 17 docker image and fix simulation #138

isuru89 · Dec 29, 2023 · 0d4a325 · 0d4a325
1 parent baa3008
commit 0d4a325
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 31 deletions.
diff --git a/build.sh b/build.sh
@@ -3,7 3,12 @@
 echo "==============================================================================="
 echo "Building Oasis..."
 echo "==============================================================================="
-mvn install -DskipTests
 mvn clean install -DskipTests
 
 echo "==============================================================================="
 echo "Build the base java image"
 echo "==============================================================================="
 docker build -t oasis/base-java -f ./buildscripts/docker/Dockerfile-base-java .
 
 cp externals/kafka-stream/target/libs/* buildscripts/modules
 cp externals/kafka-stream/target/oasis-ext-kafkastream.jar buildscripts/modules
@@ -47,7 52,7 @@ mkdir -p .tmpdata/cache
 echo "==============================================================================="
 echo "Starting Oasis..."
 echo "==============================================================================="
-docker compose up
 docker compose up --no-attach kafka --no-attach zookeeper --no-attach stats-api
 
 
 
diff --git a/buildscripts/docker/Dockerfile-base-java b/buildscripts/docker/Dockerfile-base-java
@@ -0,0 1,9 @@
 # Apparently there is no jre 17 slim version. :(
 # https://github.com/docker-library/openjdk/issues/468
 FROM openjdk:17.0.2-jdk-slim
 
 MAINTAINER Isuru Weerarathna <[email protected]>
 
 ## Add the wait script to the image
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.8.0/wait /wait
 RUN chmod x /wait
diff --git a/buildscripts/stats-api.properties b/buildscripts/stats-api.properties
@@ -10,5 10,6 @@ spring.liquibase.enabled=false
 oasis.db.engine=redis
 oasis.db.admin=jdbc
 
 spring.h2.console.enabled=false
 
 oasis.schema.dir=file:/etc/oasis/schema/oasis-changelog-master.yml
diff --git a/engine/Dockerfile b/engine/Dockerfile
@@ -1,4 1,4 @@
-FROM openjdk:11.0-jre-slim
 FROM oasis/base-java
 
 MAINTAINER Isuru Weerarathna <[email protected]>
 

diff --git a/services/events-api/Dockerfile b/services/events-api/Dockerfile
@@ -1,4 1,4 @@
-FROM openjdk:11.0-jre-slim
 FROM oasis/base-java
 
 MAINTAINER Isuru Weerarathna <[email protected]>
 

diff --git a/services/events-api/pom.xml b/services/events-api/pom.xml
@@ -148,7 148,6 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
- <version>3.1.2</version>
  <configuration>
  <archive>
  <manifest>

diff --git a/services/feeder/Dockerfile b/services/feeder/Dockerfile
@@ -1,4 1,4 @@
-FROM openjdk:11.0-jre-slim
 FROM oasis/base-java
 
 MAINTAINER Isuru Weerarathna <[email protected]>
 ## Add the wait script to the image

diff --git a/services/stats-api/Dockerfile b/services/stats-api/Dockerfile
@@ -1,4 1,4 @@
-FROM openjdk:11.0-jre-slim
 FROM oasis/base-java
 
 MAINTAINER Isuru Weerarathna <[email protected]>
 

diff --git a/simulations/src/main/java/io/github/oasis/simulations/Simulation.java b/simulations/src/main/java/io/github/oasis/simulations/Simulation.java
@@ -62,7 62,7 @@
  */
 public class Simulation implements Closeable {
 
- static final String SOURCE_NAME = "oasis.simulation.internal";
  static final String SOURCE_NAME = "oasis_simulation_internal";
  static String SOURCE_TOKEN;
  static int SOURCE_ID = 1;
  static int GAME_ID = 1001;

diff --git a/simulations/src/main/java/io/github/oasis/simulations/SimulationWithApi.java b/simulations/src/main/java/io/github/oasis/simulations/SimulationWithApi.java
@@ -235,8 235,8 @@ protected void persistUsers(List<User> users) throws IOException {
  "gameId", GAME_ID,
  "teamId", teamId);
 
- request = adminApiReq("/players/" dbUser.getId() "/teams")
- .POST(HttpRequest.BodyPublishers.ofString(mapper.writeValueAsString(dataReq)))
  request = adminApiReq("/players/" dbUser.getId() "/teams/" teamId)
  .POST(HttpRequest.BodyPublishers.noBody())
  .build();
  HttpResponse<Void> resultTeamAdd = client.send(request, HttpResponse.BodyHandlers.discarding());
  if (resultTeamAdd.statusCode() >= 400) {

diff --git a/simulations/src/main/resources/application.conf b/simulations/src/main/resources/application.conf
@@ -15,7 15,7 @@ oasis {
  signal = 10
  }
  redis = {
- host: "localhostxxx"
  host: "localhost"
  port: 6379
 
  pool {

diff --git a/simulations/stackoverflow/rules/badges.yml b/simulations/stackoverflow/rules/badges.yml
@@ -11,7 11,7 @@ elements:
  matchEvent: stackoverflow.question.asked
  rewards:
  badge:
- attribute: 3
  rank: 3
 
  - name: First-Accepted
  id: B-FACC
@@ -25,7 25,7 @@ elements:
  expression: e['userId'] == e['askedBy'];
  rewards:
  badge:
- attribute: 3
  rank: 3
 
  - name: Visit-Site
  id: B-VSITE
@@ -46,15 46,15 @@ elements:
  - streak: 50
  rewards:
  badge:
- attribute: 3
  rank: 3
  - streak: 75
  rewards:
  badge:
- attribute: 2
  rank: 2
  - streak: 100
  rewards:
  badge:
- attribute: 1
  rank: 1
 
  - name: Popular-Question
  id: B-POPQ
@@ -69,17 69,17 @@ elements:
  condition: e['votes'] == 100
  rewards:
  badge:
- attribute: 1
  rank: 1
  - priority: 2
  condition: e['votes'] == 50
  rewards:
  badge:
- attribute: 2
  rank: 2
  - priority: 3
  condition: e['votes'] == 30
  rewards:
  badge:
- attribute: 3
  rank: 3
 
  - name: Favourite-Question
  id: B-FAVQ
@@ -94,17 94,17 @@ elements:
  condition: e['favourites'] == 50
  rewards:
  badge:
- attribute: 1
  rank: 1
  - priority: 2
  condition: e['favourites'] == 25
  rewards:
  badge:
- attribute: 2
  rank: 2
  - priority: 3
  condition: e['favourites'] == 10
  rewards:
  badge:
- attribute: 3
  rank: 3
 
  - name: Viewed-Question
  id: B-VIEWQ
@@ -119,17 119,17 @@ elements:
  condition: e['views'] == 10000
  rewards:
  badge:
- attribute: 1
  rank: 1
  - priority: 2
  condition: e['views'] == 5000
  rewards:
  badge:
- attribute: 2
  rank: 2
  - priority: 3
  condition: e['views'] == 1000
  rewards:
  badge:
- attribute: 3
  rank: 3
 
  - name: Daily-Reputations
  id: B-DREP
@@ -148,15 148,15 @@ elements:
  - value: 200
  rewards:
  badge:
- attribute: 1
  rank: 1
  - value: 150
  rewards:
  badge:
- attribute: 2
  rank: 2
  - value: 100
  rewards:
  badge:
- attribute: 3
  rank: 3
 
  - name: Max-Reputations
  id: B-MAXREP
@@ -176,12 176,12 @@ elements:
  - streak: 2
  rewards:
  badge:
- attribute: 3
  rank: 3
  - streak: 5
  rewards:
  badge:
- attribute: 2
  rank: 2
  - streak: 10
  rewards:
  badge:
- attribute: 1
  rank: 1