Solved docker-compose

cvazquezlos · Apr 25, 2017 · 9e70108 · 9e70108
1 parent 961b43d
commit 9e70108
Show file tree

Hide file tree

Showing 32 changed files with 101,719 additions and 835 deletions.
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,4 +1,7 @@
 FROM java:8
+COPY target/src src/
+CMD ["ls"]
 EXPOSE 8443
 ADD /target/SpringDocker.jar SpringDocker.jar
-ENTRYPOINT ["java","-jar","SpringDocker.jar"]
+ENTRYPOINT ["java","-jar","SpringDocker.jar"]
+
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -4,8 +4,8 @@ server.ssl.key-store-password = password
 server.ssl.key-password = secret
 spring.h2.console.enabled=true
 
-spring.datasource.url = jdbc:mysql://localhost/brems?verifyServerCertificate=false&useSSL=true
-spring.datasource.username = root
+spring.datasource.url = jdbc:mysql://bremsHost:3306/brems?verifyServerCertificate=false&useSSL=true
+spring.datasource.username = user
 spring.datasource.password = 1234
 spring.datasource.driverClassName = com.mysql.jdbc.Driver
 spring.jpa.hibernate.ddl-auto = create-drop

diff --git a/backend/target/classes/META-INF/MANIFEST.MF b/backend/target/classes/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Implementation-Title: appSpring
 Implementation-Version: 0.0.1
-Built-By: c.vazquezlos
+Built-By: jherel
 Implementation-Vendor-Id: es.urjc.daw
 Build-Jdk: 1.8.0_121
 Implementation-URL: http://projects.spring.io/spring-boot/appSpring/

diff --git a/backend/target/classes/application.properties b/backend/target/classes/application.properties
@@ -4,8 +4,8 @@ server.ssl.key-store-password = password
 server.ssl.key-password = secret
 spring.h2.console.enabled=true
 
-spring.datasource.url = jdbc:mysql://localhost/brems?verifyServerCertificate=false&useSSL=true
-spring.datasource.username = root
+spring.datasource.url = jdbc:mysql://bremsHost:3306/brems?verifyServerCertificate=false&useSSL=true
+spring.datasource.username = user
 spring.datasource.password = 1234
 spring.datasource.driverClassName = com.mysql.jdbc.Driver
 spring.jpa.hibernate.ddl-auto = create-drop

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,8 +8,8 @@ services:
       - MYSQL_DATABASE=brems
       - MYSQL_USER=user
       - MYSQL_PASSWORD=1234
-  spring-boot-jpa-docker-webapp:
-    image: jherel/brems
+  webapp:
+    image: brems
     depends_on:
       - bremsHost
     ports:
@@ -20,3 +20,11 @@ services:
       - DATABASE_PASSWORD=1234
       - DATABASE_NAME=brems
       - DATABASE_PORT=3306
+  bremsAngular:
+    image: jherel/brems-angular
+    depends_on:
+      - webapp
+    ports:
+      - 4200:80
+    environment:
+      - API_URL=webapp
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx
+COPY dist /usr/share/nginx/html
diff --git a/frontend/dist/0.a5cd1cf7c61718cab898.chunk.js b/frontend/dist/0.a5cd1cf7c61718cab898.chunk.js
diff --git a/frontend/dist/0.chunk.js b/frontend/dist/0.chunk.js
diff --git a/frontend/dist/0.chunk.js.map b/frontend/dist/0.chunk.js.map
diff --git a/frontend/dist/1.1e7c39ae49e6ce05e0a3.chunk.js b/frontend/dist/1.1e7c39ae49e6ce05e0a3.chunk.js
diff --git a/frontend/dist/1.chunk.js b/frontend/dist/1.chunk.js
diff --git a/frontend/dist/1.chunk.js.map b/frontend/dist/1.chunk.js.map
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -13,10 +13,10 @@
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
   <link rel="stylesheet" type="text/css" href="styles.css">
   -->
-<link href="styles.c5ac2ad4f41693055bd3.bundle.css" rel="stylesheet"/></head>
+</head>
 
 <body class="hold-transition skin-blue sidebar-mini">
   <app-root>Loading...</app-root>
-<script type="text/javascript" src="inline.370fd55ee519fd8c20b4.bundle.js"></script><script type="text/javascript" src="polyfills.6e05abdb22be14b8ee4d.bundle.js"></script><script type="text/javascript" src="vendor.1edd72694390150883c6.bundle.js"></script><script type="text/javascript" src="main.2456986fdff5942bd93f.bundle.js"></script></body>
+<script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="styles.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
 
 </html>
diff --git a/frontend/dist/inline.370fd55ee519fd8c20b4.bundle.js b/frontend/dist/inline.370fd55ee519fd8c20b4.bundle.js
diff --git a/frontend/dist/inline.bundle.js b/frontend/dist/inline.bundle.js
diff --git a/frontend/dist/inline.bundle.js.map b/frontend/dist/inline.bundle.js.map
diff --git a/frontend/dist/main.2456986fdff5942bd93f.bundle.js b/frontend/dist/main.2456986fdff5942bd93f.bundle.js