From 0bc0f6313127e5957225697d149345628bfbba5c Mon Sep 17 00:00:00 2001
From: Kirill Grachev <kirill.grachoff@gmail.com>
Date: Mon, 22 May 2023 21:57:46 +0300
Subject: [PATCH] SNRK-100: Fix local problems with docker, Update scripts

---
 Dockerfile     | 4 ++--
 requirments.sh | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8aca71..e481fd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,10 +16,10 @@ COPY . .
 
 RUN ./requirments.sh
 
-RUN ./gradlew clean build
+RUN bash -c "source ~/.sdkman/bin/sdkman-init.sh && ./gradlew clean build"
 
 EXPOSE 8080
 
 RUN mkdir -p ~/.aws/ && ln -s /run/secrets/credentials.json ~/.aws/credentials.json
 
-CMD ./gradlew :snark-main:run_server
\ No newline at end of file
+CMD bash -c "source ~/.sdkman/bin/sdkman-init.sh && ./gradlew :snark-main:run_server"
\ No newline at end of file
diff --git a/requirments.sh b/requirments.sh
index 0d621de..9a73e1a 100755
--- a/requirments.sh
+++ b/requirments.sh
@@ -5,8 +5,6 @@ set -e
 apt-get update
 apt-get install -y sudo
 
-sudo apt-get install -y kotlin
-
 for dir in ./*/
 do
     if [[ $dir == *'snark'* ]]
@@ -17,8 +15,9 @@ do
         then
 
             cd ci
-
-            ./requirments.sh
+            if [[ -f requirements.sh ]]; then
+              ./requirments.sh
+            fi
 
             cd ..
         fi