Commit Graph

155 Commits

Author SHA1 Message Date
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
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
Stefan Scherer
a1b127be03 Merge pull request #146 from ags1773/fix-test
fix: path to db file in test
2021-11-12 09:23:50 +01:00
Stefan Scherer
9bccc3cf99 Merge pull request #169 from paulhermanseu/patch-1
Update package.json
2021-11-12 09:15:13 +01:00
Stefan Scherer
5ded522cbf Merge pull request #90 from spicylentils/patch-3
Update docs/tutorial/using-bind-mounts/index.md
2021-11-12 08:31:17 +01:00
Stefan Scherer
ace32adb9d Merge pull request #120 from Patil2099/master
Point To The Correct Link For Play With Docker
2021-11-12 08:30:00 +01:00
Stefan Scherer
5572d7a5b3 Merge pull request #219 from docker/dependabot/pip/mkdocs-1.2.3
Bump mkdocs from 1.2.2 to 1.2.3
2021-11-12 08:28:11 +01:00
Stefan Scherer
572dc47f99 Merge pull request #126 from GomolemoOnGithub/patch-1
Period omission at the end of line 7,8 and 10.
2021-11-12 08:20:13 +01:00
Stefan Scherer
5c65399cec Merge pull request #113 from NicolaeTelescu/patch-1
Update index.md from using bind mount
2021-11-12 08:16:00 +01:00
dependabot[bot]
6086449d15 Bump mkdocs from 1.2.2 to 1.2.3
Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/mkdocs/mkdocs/releases)
- [Commits](https://github.com/mkdocs/mkdocs/compare/1.2.2...1.2.3)

---
updated-dependencies:
- dependency-name: mkdocs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-12 07:04:04 +00:00
Stefan Scherer
5c00304375 Merge pull request #199 from sugamkarki/master
Removed body-parser as a dependency.
2021-11-12 08:03:35 +01:00
Stefan Scherer
0efc3a5c19 Merge pull request #218 from StefanScherer/faster-getting-started-guide
Faster getting started guide, fix for Apple silicon
2021-11-11 11:05:18 +01:00
Stefan Scherer
782d9421ae Add dependencies for Apple silicon / M1 / arm64 builds
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-11-10 16:27:07 +01:00
Stefan Scherer
d002206c3e Make getting started guide faster
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-11-10 16:27:06 +01:00
Stefan Scherer
e04817f421 Merge pull request #178 from zuccamia/update-reference-urls
Update reference links in docker compose section.
2021-11-10 09:50:31 +01:00
Stefan Scherer
0f44699cfa Merge pull request #196 from docker/dependabot/npm_and_yarn/app/tmpl-1.0.5
Bump tmpl from 1.0.4 to 1.0.5 in /app
2021-11-10 09:43:55 +01:00
Stefan Scherer
966b2e2857 Merge pull request #179 from docker/dependabot/npm_and_yarn/app/path-parse-1.0.7
Bump path-parse from 1.0.6 to 1.0.7 in /app
2021-11-10 09:43:30 +01:00
Stefan Scherer
de74d48616 Merge pull request #163 from catnuxer/docs-persisting-our-data
docs: Fix missing container id
2021-11-10 09:41:14 +01:00
Stefan Scherer
14c67643bb Merge pull request #212 from spenceradolph/master
Removed 'RUN apk add --no-cache python g++ make'
2021-11-10 08:40:35 +01:00
Spencer Adolph
acdcd83ced Removed 'RUN apk add --no-cache python g++ make'
This line did not appear to be necessary for the tutorial. Testing with it removed appeared to have no effect. Additionally, this line does not appear later in the tutorial when referring back to this step (see /docs/tutorial/image-building-best-practices/index.md).
2021-10-21 12:57:36 -05:00
Guillaume Lours
8511b9af07 Merge pull request #209 from docker/fix-security-issues
update javascript dependencies to fix security issues
2021-10-08 17:34:24 +02:00
Guillaume Lours
f2af4b0ae4 update javascript dependencies to fix security issues
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2021-10-08 17:31:47 +02:00