diff --git a/Dockerfile b/Dockerfile index d2e4ebb8863565e87d74c5f4ff1402b69daf0615..77d80ff3751b2f67564868229f61368a070e6a15 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 1b9b70158c0f2277082d758175fc2b8469ba9ddd..e3013fc52cdc5f341e9e4bdbea39e7128f657c2b 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 33cfca2d2b830b24821701518bd75fe7ca6116e7..69daab28ca06779ace448d3f92030c14be7c1db3 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 730933a2f3dc22d88255f745d5d21746b7a5078f..75886fba8594446f501cba88e11a10343ff67044 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 749df9d098309a16067a1556ac015d321710cb57..0000000000000000000000000000000000000000 --- 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