From 8f76dd34459b9614132bbdadcb1d8475eb3c701d Mon Sep 17 00:00:00 2001
From: Thomas <gltron3000@gmail.com>
Date: Sun, 31 May 2020 18:09:41 +0200
Subject: [PATCH] Random fixs
---
Dockerfile | 6 +++---
buildAndRun.sh | 12 ++++++++++--
mozen/src/main/java/mozen/business/VoteManager.java | 4 ----
mozen/src/main/resources/application.properties | 10 +++++-----
quickBuildToJar.sh | 7 -------
5 files changed, 18 insertions(+), 21 deletions(-)
delete mode 100755 quickBuildToJar.sh
diff --git a/Dockerfile b/Dockerfile
index d2e4ebb..77d80ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:edge
MAINTAINER gltron
RUN apk --update add openjdk8-jre
-COPY mozen/target/mozen-0.0.1-SNAPSHOT.jar /home/mozen-0.0.1-SNAPSHOT.jar
-CMD ["java","-jar","/home/mozen-0.0.1-SNAPSHOT.jar"]
-EXPOSE 8181
\ No newline at end of file
+COPY mozen.jar /home/mozen.jar
+CMD ["java","-jar","/home/mozen.jar"]
+EXPOSE 8181
diff --git a/buildAndRun.sh b/buildAndRun.sh
index 1b9b701..e3013fc 100755
--- a/buildAndRun.sh
+++ b/buildAndRun.sh
@@ -1,3 +1,11 @@
-./quickBuildToJar.sh
+git clone https://gitlab.lis-lab.fr/thomas.blanc/ter-modelzoo-frontend.git
+cd ter-modelzoo-frontend
+npm install
+npm run build
+mv dist/* ../mozen/src/main/resources/public/
+cd ../mozen
+mvn package
+cd ../
+cp mozen/target/mozen-0.0.1-SNAPSHOT.jar mozen.jar
docker build . -t gltron/mozen
-docker-compose up -d
\ No newline at end of file
+docker-compose up -d
diff --git a/mozen/src/main/java/mozen/business/VoteManager.java b/mozen/src/main/java/mozen/business/VoteManager.java
index 33cfca2..69daab2 100644
--- a/mozen/src/main/java/mozen/business/VoteManager.java
+++ b/mozen/src/main/java/mozen/business/VoteManager.java
@@ -6,14 +6,10 @@ import org.springframework.stereotype.Service;
import mozen.model.Model;
import mozen.model.User;
import mozen.repos.ModelRepository;
-import mozen.repos.UserRepository;
@Service
public class VoteManager implements IVoteManager {
- @Autowired
- private UserRepository userRepo;
-
@Autowired
private ModelRepository modelRepo;
diff --git a/mozen/src/main/resources/application.properties b/mozen/src/main/resources/application.properties
index 730933a..75886fb 100644
--- a/mozen/src/main/resources/application.properties
+++ b/mozen/src/main/resources/application.properties
@@ -22,11 +22,11 @@ server.port=8181
#spring.jpa.hibernate.ddl-auto=update
# DOCKER + MARIADB
-#spring.datasource.url=jdbc:mariadb://mozen_mariadb:3306/MOZEN_DB
-#spring.datasource.username=mozen_user
-#spring.datasource.password=1234
-#spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-#spring.jpa.hibernate.ddl-auto=update
+spring.datasource.url=jdbc:mariadb://mozen_mariadb:3306/MOZEN_DB
+spring.datasource.username=mozen_user
+spring.datasource.password=1234
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.jpa.hibernate.ddl-auto=update
spring.servlet.multipart.max-file-size=10GB
spring.servlet.multipart.max-request-size=10GB
diff --git a/quickBuildToJar.sh b/quickBuildToJar.sh
deleted file mode 100755
index 749df9d..0000000
--- a/quickBuildToJar.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-git clone https://gitlab.lis-lab.fr/thomas.blanc/ter-modelzoo-frontend.git
-cd ter-modelzoo-frontend
-npm install
-npm run build
-mv dist/* ../mozen/src/main/resources/public/
-cd ../mozen
-mvn package
\ No newline at end of file
--
GitLab