Commit Graph

47 Commits

Author SHA1 Message Date
Stefan Scherer da93b17c2c Use single shorthand flags, better for beginners
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-07-03 10:10:47 +02:00
Stefan Scherer 58c271ce20 Merge pull request #67 from StefanScherer/build-push-image
Add Jenkinsfile to push image
2020-07-02 19:35:48 +02:00
Stefan Scherer a9a4a1fca0 Add Jenkinsfile to push image
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2020-07-02 19:31:59 +02:00
Stefan Scherer 823b0d4642 Merge pull request #49 from Terag/master
Removes timeout on mysql connection
2020-06-29 20:51:19 +02:00
Stefan Scherer c9ac9f27df Merge pull request #50 from erichays/best-practices-fix
Match output to input and clarify build command
2020-06-29 10:54:46 +02:00
Stefan Scherer ef2a395b78 Merge pull request #47 from dmahnkopf/master
Add .dockerignore for node_modules & explanation
2020-06-26 09:12:17 +02:00
Stefan Scherer e1b7106a94 Merge pull request #8 from docker/dependabot/npm_and_yarn/app/acorn-5.7.4
Bump acorn from 5.7.3 to 5.7.4 in /app
2020-06-26 09:07:22 +02:00
Stefan Scherer e77618c873 Merge pull request #3 from docker/dependabot/npm_and_yarn/app/handlebars-4.7.3
Bump handlebars from 4.2.0 to 4.7.3 in /app
2020-06-26 09:06:59 +02:00
Eric Hays 1c571de3d5 Match output to input and clarify build command
The Dockerfile listed above specifically uses package.json, but the
output listed for the build lists package*, which is inconsistent. The
React example later in the doc uses package*, which would be consistent
with the output, but this should fix the mismatch for the beginner going
through the tutorial for the first time.

Additionally, the sentence "Build the Docker image now using 'docker
build' again" might be confusing to a beginner. I specifically tested
running this exact command and it gives an error message. Specifically
using the exact command needed to build this target shouldn't take up
too much space.
2020-06-03 02:10:30 +00:00
Victor Rouquette 904351416f Removes timeout on mysql connection 2020-06-03 00:05:29 +02:00
Dominik Mahnkopf fc9025459a Add .dockerignore for node_modules & explanation 2020-06-02 22:07:07 +02:00
Michael Irwin 35dc319a76 Merge pull request #39 from ideskov/master
Avoid sending duplicate PUT requests when toggling completion
2020-05-28 08:06:32 -04:00
Michael Irwin d9d750d42a Merge pull request #44 from erichays/bind-mounts-fix
Fix typo in -v description
2020-05-28 08:06:15 -04:00
Eric Hays 55a83f8292 Fix typo in -v description 2020-05-28 09:33:05 +00:00
Michael Irwin 1e7f598993 Merge pull request #40 from biancapower/patch-1
add a word for clarity
2020-05-26 08:10:03 -04:00
Bianca Power fe81ff7e29 add a word for clarity 2020-05-26 19:43:05 +10:00
Ivan Deskov 1879caaa00 Only handle onclick in the button instead of stopping propagation 2020-05-24 21:12:06 +01:00
Ivan Deskov 1874dc4724 Avoid sending duplicate PUT requests when toggling completion 2020-05-24 00:13:24 +01:00
Michael Irwin 6d6a950908 Merge pull request #38 from StefanScherer/improve-guide
Explain `-v` option, explain how to write long PowerShell commands
2020-05-21 15:52:38 -04:00
Stefan Scherer 9bb08eeadd Explain change for multi-line PowerShell commands
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-05-21 15:03:15 +02:00
Stefan Scherer 89230c73dc Explain -v
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-05-21 15:02:30 +02:00
Michael Irwin 6652785552 Merge pull request #34 from StefanScherer/add-instructions
Clarify how to create Dockerfile and how to build
2020-05-18 10:54:48 -04:00
Michael Irwin 8f412d2435 Merge pull request #35 from StefanScherer/improve-data-txt
Improve steps in "Persisting our DB"
2020-05-18 10:53:29 -04:00
Stefan Scherer ba1cc7351e Stop container before using volume 2020-05-17 18:06:16 +02:00
Stefan Scherer 9864607e6b Improve step to show content of the data.txt
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-05-17 17:51:12 +02:00
Stefan Scherer ed772263e4 Clarify how to create Dockerfile and how to build
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-05-17 17:29:02 +02:00
Michael Irwin b9fe2cd927 Merge pull request #22 from NotUnlikeTheWaves/patch-1
Minor text tweaks in docker compose chapter
2020-05-05 16:47:27 -04:00
NotUnlikeTheWaves 38c2276109 Minor text tweaks in docker compose chapter 2020-05-05 22:35:03 +02:00
Michael Irwin cd4e0fc8d8 Merge pull request #18 from rahul-kumi/master
correct intent in 'Layer Caching' description
2020-04-20 15:25:53 -04:00
Michael Irwin 8206d59cbd Merge pull request #20 from docker/remove-sri
Removed SRI hashes from index.html
2020-04-19 17:44:41 -04:00
Michael Irwin f74293d937 Removed SRI hashes from index.html
Signed-off-by: Michael Irwin <mikesir87@gmail.com>

Work-around for #9 while trying to figure out what's going on
2020-04-19 17:43:23 -04:00
Rahul Kumaresan 98a838c3c5 correct intent in 'Layer Caching' description 2020-04-19 13:52:03 +05:30
Michael Irwin 3b6bac1965 Merge pull request #16 from gjungb/patch-1
Update index.md
2020-04-16 13:44:37 -04:00
Gerd Jungbluth ad07012963 Update index.md
Using the official name `Node.js` should make it more accessible for beginners
2020-04-16 19:30:33 +02:00
Michael Irwin e81c911115 Merge pull request #15 from docker/qualify-pwd
Add curly brackets around $PWD usage to fix powershell issues
2020-04-15 10:37:33 -04:00
Michael Irwin c60bb74386 Add curly brackets around $PWD usage to fix powershell issues
Signed-off-by: Michael Irwin <mikesir87@gmail.com>

Resolves #7
2020-04-15 10:35:22 -04:00
Michael Irwin e3bfe08e71 Merge pull request #11 from StefanScherer/fix-build
Pin mkdoc versions
2020-04-14 08:03:29 -04:00
Stefan Scherer 94d5f62afc Pin mkdoc versions
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-04-14 10:31:49 +02:00
dependabot[bot] 76b0bf7d5e Bump acorn from 5.7.3 to 5.7.4 in /app
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-05 23:06:48 +00:00
Michael Irwin f49ff977b8 Merge pull request #6 from jrobinson041/typo-fix
Typo fix in docker compose tutorial
2020-03-19 19:16:42 -04:00
John Robinson ed5957c253 Typo fix in docker compose tutorial 2020-03-19 19:08:19 -04:00
Michael Irwin 7ba40de8b3 Merge pull request #4 from docker/remove-arg
Remove unused ARG from Dockerfile
2020-03-02 13:47:28 -05:00
Michael Irwin e6538eff54 Remove unused ARG from Dockerfile
Resolves #1
2020-03-02 13:46:36 -05:00
dependabot[bot] 915b5a6b3a Bump handlebars from 4.2.0 to 4.7.3 in /app
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.7.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.7.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-02 18:44:02 +00:00
Michael Irwin 1651f11888 Merge pull request #2 from nebuk89/patch-1
Adding in dependency -minify
2020-03-02 13:43:29 -05:00
Ben De St Paer-Gotch 2c0cd73b95 Adding in dependency -minify
mkdocs is looking for minify and it currently isn't installed causing my builds to fail (unless I am fundamentally doing something wrong?) 
Added to requirements for installer
2020-03-02 16:29:24 +00:00
Michael Irwin 5bb26cc53a Initial commit
Signed-off-by: mikesir87 <mikesir87@gmail.com>

Imported from dockersamples/101-tutorial, removed other languages
for now, and replaced PWD references with Docker Desktop.
2020-02-05 22:04:43 -05:00