Docker added

.dockerignore

@@ -0,0 +1,24 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+README.md

Dockerfile

@@ -0,0 +1,11 @@
+
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+ARG JAVA_OPTS
+ENV JAVA_OPTS=$JAVA_OPTS
+ADD webapp12.jar webapp12.jar
+EXPOSE 8443
+ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar webapp12.jar
+#ENTRYPOINT exec java $JAVA_OPTS -jar webapp12.jar
+# For Spring-Boot project, use the entrypoint below to reduce Tomcat startup time.
+#ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar webapp12.jar

daw.webapp12/instruccionesDocker.txt

@@ -0,0 +1,14 @@
+1.Crear el .jar en powershell en la direccion donde este el pom.xml
+    se crea en en la carpeta target cambiamos el nombre a webapp12.jar
+    y la movemos a la carpeta principal(webapp12)
+
+    COMANDO: mvn package
+2.Caontruimos la imagen con docker file boton derecho build image
+    COMANDO: docker build --rm -f "Dockerfile" -t webapp12:latest "."
+3.Para correr el docker:
+
+COMANDO: docker run webapp12
+         docker run -p 8443:8443 --name webapp12 webapp12
+
+4.compilar la aplicacion completa:
+    COMANDO:docker-compose -f "docker-compose.yml" up -d --build

daw.webapp12/pom.xml

@@ -11,9 +11,9 @@
 	<groupId>com.daw.webapp12</groupId>
 	<artifactId>daw.webapp12</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
 	<name>daw.webapp12</name>
 	<description>DAW project</description>
-
 	<properties>
 		<java.version>1.8</java.version>
 	</properties>
@@ -89,8 +89,20 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<configuration>
+							<classifier>spring-boot</classifier>
+							<mainClass>
+							com.daw.webapp12.Application
+							</mainClass>
+						</configuration>
+					</execution>
+			</executions>
 			</plugin>
 		</plugins>
 	</build>
-
 </project>

daw.webapp12/src/main/java/com/daw/webapp12/controller/AdvertisementController.java

@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;

daw.webapp12/src/main/java/com/daw/webapp12/controller/MainController.java

@@ -1,5 +1,12 @@
 package com.daw.webapp12.controller;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.daw.webapp12.entity.Advertisement;
 import com.daw.webapp12.entity.Users;
 import com.daw.webapp12.repository.AdvertisementRepository;
@@ -11,20 +18,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 
 @Controller
 public class MainController {

daw.webapp12/src/main/java/com/daw/webapp12/controller/UserController.java

@@ -1,7 +1,5 @@
 package com.daw.webapp12.controller;
 
-import java.util.Arrays;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -11,10 +9,8 @@
 import com.daw.webapp12.security.UserRepositoryAuthenticationProvider;
 import com.daw.webapp12.service.AdvertisementService;
 import com.daw.webapp12.service.UserService;
-import com.daw.webapp12.repository.UserRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,8 +19,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
 
 
 

daw.webapp12/src/main/java/com/daw/webapp12/entity/Users.java

@@ -7,7 +7,6 @@
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import org.hibernate.annotations.Cascade;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 @Entity

daw.webapp12/src/main/java/com/daw/webapp12/iniBBDD.java

@@ -9,9 +9,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.annotation.PostConstruct;
 
 @Component

daw.webapp12/src/main/java/com/daw/webapp12/service/UserService.java

@@ -3,7 +3,6 @@
 import com.daw.webapp12.entity.Users;
 import com.daw.webapp12.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;

daw.webapp12/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:mysql://localhost/daw_webapp12?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://mysql/daw_webapp12?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=13777091825
 server.port=8443