Michael Irwin
8467efed09
Merge branch 'master' into master
2022-11-28 17:59:51 -05:00
Michael Irwin
b4d6426abc
Merge pull request #107 from kieran6roberts/docs-wording-improvements
...
changed some of docs text/wording to improve readability
2022-11-28 17:55:13 -05:00
Michael Irwin
08ac9d963d
Merge branch 'master' into docs-wording-improvements
2022-11-28 17:54:22 -05:00
Michael Irwin
d7d4b09c4f
Merge pull request #317 from docker/update-to-latest-versions-of-everything
2022-11-24 22:45:46 -05:00
Michael Irwin
3ad69345c3
Update two other instances of "docker-compose" to "docker compose"
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-23 11:42:16 -05:00
Michael Irwin
7e006777d7
Update copyright to current year
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 23:32:14 -05:00
Michael Irwin
2bca273ff4
Fix Dockerfile build to actually run tests and fix a unit test
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 23:27:02 -05:00
Michael Irwin
b6ea4168d4
Update screenshots and docs to latest versions
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 23:13:08 -05:00
Michael Irwin
726bfd126b
Upgrade mysql package to mysql2 to support new auth methods
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 23:12:30 -05:00
Michael Irwin
1d79efa7fa
Update Dockerfile to no longer require python, make, etc.
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 22:13:47 -05:00
Michael Irwin
893c0c1bd5
Fix import path for uuid package changes
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 22:13:20 -05:00
Michael Irwin
615af9ff0d
Add app/Dockerfile to both docker and gitignore files
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 22:10:33 -05:00
Michael Irwin
fec54de67b
Update sample app deps to latest versions and node to latest LTS
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2022-11-22 22:09:01 -05:00
Michael Irwin
b4f92f7c6b
Merge pull request #292 from muescha/patch-4
...
doc(using-docker-compose): update docker file reference
2022-11-18 17:13:09 -05:00
Michael Irwin
3a38099971
Merge pull request #311 from tatsuyafw/patch-1
...
Merge two spaces into one in README
2022-11-18 17:00:07 -05:00
Tatsuya Hoshino
6ccdca1634
Merge two spaces into one in README
2022-11-05 00:16:47 +09:00
Stefan Scherer
6f818a549f
Merge pull request #295 from craig-osterhout/patch-1
...
Fix dead links
2022-08-30 14:55:19 +02:00
Craig Osterhout
cb16e5d1f3
Fix dead links
...
Fixed dead links that resulted in 404 errors.
- https://docs.docker.com/docker-for-mac/dashboard/
- https://docs.docker.com/docker-for-windows/dashboard/
Updated to a single link to https://docs.docker.com/desktop/
2022-08-16 10:43:20 -07:00
Muescha
54beb2b872
update docker file reference
2022-08-06 23:50:20 +02:00
Stefan Scherer
7d6a447fca
Merge pull request #255 from lunelson/lunelson/markdown-fixes
...
Fix some code fences and whitespace on "multi-container apps"
2022-04-11 17:00:51 +02:00
Stefan Scherer
0fdedec7a2
Merge branch 'master' into lunelson/markdown-fixes
2022-04-11 16:57:59 +02:00
Stefan Scherer
9a4c1b53dd
Merge pull request #252 from pushparajbhatta/patch-1
...
Update index.md
2022-04-11 16:55:11 +02:00
Stefan Scherer
1fd29da9be
Merge pull request #223 from geehon/master
...
support emoji
2022-04-11 16:53:42 +02:00
Stefan Scherer
2dac6361da
Merge pull request #243 from yuuyins/issue-76-2
...
Fix #76
2022-04-11 16:48:15 +02:00
Stefan Scherer
858d6c7607
Merge pull request #249 from amims71/patch-1
...
fixed broken code design
2022-04-11 16:44:27 +02:00
Stefan Scherer
16d65a70fe
Merge pull request #256 from docker/dependabot/npm_and_yarn/app/minimist-1.2.6
...
Bump minimist from 1.2.5 to 1.2.6 in /app
2022-04-11 16:40:59 +02:00
Stefan Scherer
664ad9edab
Merge pull request #265 from spykard/master
...
Fix Build Error
2022-04-11 16:36:46 +02:00
Spyridon Kardakis
95a8d8a72b
Fix Build Error #257
2022-04-04 15:20:17 +03:00
dependabot[bot]
d5044a9db7
Bump minimist from 1.2.5 to 1.2.6 in /app
...
Bumps [minimist](https://github.com/substack/minimist ) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases )
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6 )
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-26 06:13:18 +00:00
Lu Nelson
96670a1d03
fix code fences on multi-container doc
2022-03-21 11:37:25 +01:00
Pushpa Raj Bhatta
5abe931855
Update index.md
...
Bash code preview is breaking on line 75. Updated line 75 to it.
2022-02-26 00:41:12 +05:45
Amimul Ehshan
8801e0e0ca
fixed broken code design
2022-02-18 19:26:51 +06:00
yuu
9b5581d3bd
Fix #76
...
If the user runs that command "from the source code folder", i.e.
`getting-started`, docker will bind-mount getting-started to the
container's `/app`, which leads to error
`error Couldn't find a package.json file in "/app"`. It needs to bind
`getting-started/app` instead.
So, be explicit to the reader to be on the app source's directory
`getting-started/app` before running the command.
2022-02-12 01:35:40 -03:00
Stefan Scherer
798c396e89
Merge pull request #140 from tjmcewan/patch-1
...
Update dev mode command to install sqlite3 deps
2022-02-10 09:59:19 +01:00
Stefan Scherer
9eab81d81e
Update index.md
2022-02-10 09:58:21 +01:00
Stefan Scherer
720eadbeae
Merge pull request #242 from StefanScherer/revert-pr192
...
Revert "Update app.js"
2022-02-10 09:52:18 +01:00
Stefan Scherer
1bec479199
Revert "Update app.js"
...
This reverts commit 7bb2ef8c6d
2022-02-10 09:36:44 +01:00
Stefan Scherer
2be5c745e8
Merge pull request #192 from aad84/patch-1
...
Update app.js
2022-02-10 09:28:26 +01:00
Stefan Scherer
5b6733e711
Merge branch 'master' into docs-wording-improvements
2022-02-10 09:24:36 +01:00
Stefan Scherer
8725352c3f
Merge pull request #238 from lucasersson/patch-1
...
Update index.md
2022-02-09 12:19:45 +01:00
Stefan Scherer
f1f2012af5
Merge pull request #237 from ScottLozano/patch-2
...
Update index.md
2022-02-09 11:59:45 +01:00
Stefan Scherer
9ddebfdd36
Merge pull request #236 from ScottLozano/patch-1
...
Update index.md
2022-02-09 11:56:45 +01:00
lucasersson
9bf480301d
Update index.md
...
updated readme to latest stable version of docker compose
2022-01-12 13:00:46 +01:00
Scott Lozano
d35fc60923
Update index.md
2022-01-05 00:55:18 -08:00
Scott Lozano
6ab1ec709f
Update index.md
2022-01-05 00:17:24 -08:00
Stefan Scherer
56890c941a
Merge pull request #226 from SosukeHosokawa/master
...
fix on 'Our Application' tutorial for Apple silicon
2021-12-02 18:25:08 +01:00
Stefan Scherer
e96065a503
Merge pull request #145 from antalvarenga/master
...
Multi-container apps: add workaround for non amd64 machines
2021-12-02 07:30:06 +01:00
SosukeHosokawa
5c1574e643
fix on 'Our application' tutorial for Apple silicon
2021-11-24 01:24:18 +09:00
GeeHon
b37be73687
support emoji
2021-11-16 12:20:43 +08:00
Stefan Scherer
42f8dbe70c
Merge pull request #187 from ollyhowell/patch-1
...
Add reminder to save file for the app refresh change
2021-11-12 09:25:15 +01:00
