Commit Graph

93 Commits

Author SHA1 Message Date
kouul
5feddf0854 resolved newline changes
Signed-off-by: kouul <maulloohans@gmail.com>
2020-03-26 14:24:47 +04:00
kouul
83a24f681f add flask sample
Signed-off-by: kouul <maulloohans@gmail.com>
2020-03-26 08:44:07 +04:00
Guillaume LOURS
56b4dc0cf9
Merge pull request #33 from glours/security_issues_vuejs_sample
Fix security issues in yarn dependencies of vuejs sample
2020-03-25 16:20:38 +01:00
Guillaume Lours
5047947946 Fix security issues in yarn dependencies of vuejs sample
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-03-25 16:20:06 +01:00
Guillaume LOURS
df60da7605
Merge pull request #32 from glours/security_issues_express_backend
Fix security issues in npm dependencies of react-express-mysql sample
2020-03-25 15:54:21 +01:00
Guillaume Lours
5cf9171841 Fix security issues in npm dependencies of react-express-mysql sample
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-03-25 15:47:33 +01:00
Anca Iordache
72869fa574
Remove reference to the samples directory 2020-03-25 15:11:33 +01:00
Guillaume Lours
4478c5c142 Udpdate some README.md files and change the version of node image for vuejs sample
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-03-24 17:00:48 +01:00
Guillaume Lours
7b5e27dd48 Update frontend port in react-java-sql README.md
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-03-24 15:15:37 +01:00
Guillaume LOURS
a06e22defb
Merge pull request #28 from jdrouet/express-mysql
react-express-mysql: fetch version from mysql
2020-03-24 15:15:12 +01:00
Jérémie Drouet
59724f87a1 react-express-mysql: get version from mysql
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-24 14:47:35 +01:00
Guillaume LOURS
775a9a5c42
Merge pull request #24 from jdrouet/update-react-apps
react-java-mysql: use create-react-app for frontend
2020-03-24 14:44:22 +01:00
Anca Iordache
aefbb547ce
Update README.md 2020-03-24 09:40:14 +01:00
Anca Iordache
92ee31c1dd
Merge pull request #27 from aiordache/master
Fix default port mapping and indentation
2020-03-24 00:46:07 +01:00
Anca Iordache
77c6920a83 Fix default port mapping and indentation
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-24 00:44:49 +01:00
Anca Iordache
dc1bb13dce
Merge pull request #26 from aiordache/master
Add prometheus-grafana sample
2020-03-23 23:30:49 +01:00
Anca Iordache
5c545883db Merge remote-tracking branch 'upstream/master' 2020-03-23 23:28:08 +01:00
Anca Iordache
6b957fa0b5 Add prometheus-grafana sample
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-23 23:27:09 +01:00
Jérémie Drouet
75aa52524c react-express-mysql: split backend code
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-23 14:18:50 +01:00
Jérémie Drouet
70be09e941 react-java-mysql: use create-react-app for frontend
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-23 14:05:33 +01:00
Guillaume LOURS
2ef179e53b
Merge pull request #25 from jdrouet/react-express-update
react-express-mysql: use create-react-app template
2020-03-23 13:46:31 +01:00
Jérémie Drouet
b58a42015d react-express-mysql: use create-react-app template
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-23 13:24:37 +01:00
Anca Iordache
bf31ad4ece
Merge pull request #21 from justincormack/dc
Use "Docker Compose" as the name of the product consistently
2020-03-20 19:36:08 +01:00
Anca Iordache
a4001ea0a8
Merge pull request #23 from mikesir87/network-name-typo-fix
Fix typo in network name for spring-postgres example
2020-03-20 19:35:18 +01:00
Michael Irwin
19dab8f353
Fix typo in network name for spring-postgres example
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2020-03-20 13:19:08 -04:00
Justin Cormack
f15254ea1b
Use "Docker Compose" as the name of the product consistently
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2020-03-20 17:09:43 +00:00
Anca
6c8754131d Improved flask backend 2020-03-20 01:51:26 +01:00
Anca Iordache
dcac9e0722
Merge pull request #20 from aiordache/master
Set different networks for db-backend and backend-proxy
2020-03-19 22:39:00 +01:00
Anca Iordache
aed528ccf7 Set different networks for db-backend and backend-proxy
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-19 22:37:57 +01:00
Anca Iordache
5d9462d796
Add wordpress-mysql sample 2020-03-19 11:34:32 +01:00
Anca Iordache
8717298d93
Merge pull request #19 from aiordache/master
Add nextcloud-redis-mariadb sample
2020-03-19 11:32:05 +01:00
Anca Iordache
fb99b4c763 Add nextcloud-redis-mariadb sample
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-19 11:31:12 +01:00
Anca Iordache
ed1bf3e681
Merge pull request #18 from aiordache/master
Add wordpress-mysql sample
2020-03-18 21:34:46 +01:00
Anca Iordache
4cd956ee1c Add wordpress-mysql sample
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-18 21:33:08 +01:00
Anca Iordache
b8ff8a951e
Add gitea-posgres reference 2020-03-18 21:00:33 +01:00
Anca Iordache
7e69309e13
Merge pull request #17 from aiordache/master
Add gitea-postgres sample
2020-03-18 20:56:24 +01:00
Anca Iordache
1138b5d387 Add gitea-postgres sample
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-18 20:55:23 +01:00
Anca Iordache
e8bcbd8384
Add the refererence to nextcloud-postgress 2020-03-18 17:55:14 +01:00
Anca Iordache
63709d14e7
Merge pull request #15 from aiordache/master
Add nextcloud-postgres sample
2020-03-18 17:47:36 +01:00
Anca Iordache
0b3ff4c62b add nextcloud-postgres sample
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-18 17:45:54 +01:00
Anca Iordache
282b212591 Merge remote-tracking branch 'upstream/master' 2020-03-18 17:44:59 +01:00
Anca Iordache
a7e0f380f6
update mysql version and query output 2020-03-17 22:03:44 +01:00
Anca Iordache
f21049270d
Merge pull request #14 from aiordache/master
Connect backend to db in the nginx-flask-mysql sample
2020-03-17 22:00:18 +01:00
Anca Iordache
6d97f7348f connect backend to db in nginx-flask-mysql
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-17 21:57:36 +01:00
Anca Iordache
7af9c0d4c2 Merge remote-tracking branch 'upstream/master' 2020-03-17 21:56:44 +01:00
Anca Iordache
92a9311d8a connect backend to db in nginx-flask-mysql
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-03-17 21:55:32 +01:00
Guillaume LOURS
6e866bda0f
Merge pull request #13 from glours/update_react-java-mysql_sample
Update Spring Boot and Mysql version for react-java-mysql sample
2020-03-17 16:49:36 +01:00
Guillaume Lours
d7d79e436f Update Spring Boot and Mysql version for react-java-mysql sample
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-03-17 16:48:08 +01:00
Guillaume LOURS
0b40d180de
Merge pull request #9 from glours/update_sparkjava_samples
Update SparkJava samples
2020-03-17 15:36:06 +01:00
Guillaume Lours
3f8a58ef62 Update SparkJava samples
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-03-17 15:31:13 +01:00