Commit Graph

235 Commits

Author SHA1 Message Date
Pedram Ashofteh-Ardakani 678d56c1e2
Docs: update sample application initiation in venv (#15506)
* Docs: update sample application initiation in venv

Until now, readers would install 'Flask' on their main system
python environment, freeze their entire packages, and grep only
the 'Flask' package! So they would be missing all the other
dependencies in their requirements file.

With this commit, a better practice is followed. First, create a
clean virtual environment, then install 'Flask' and freeze
everything into the requirements file.

Also, I recommend using 'python3 -m pip freeze' instead of 'pip3
freeze' while in the virtual environment. This is because
sometimes hidden quirks of 'pip' will ignore the actiavted
environment and freeze the entire python packages in the
system (e.g. in ArchLinux).

* Docs: update python sample testing application

In the previous commit, I forgot to update the 'Test the
application' section so that the users activate the virtual
environment first.

This commit fixes that.

Co-authored-by: Stefan Scherer <stefan.scherer@docker.com>
2022-10-21 14:47:24 -07:00
Craig Osterhout ad614f1d2c
[Issue 12622] Node.js guide - update example code (#15922)
* update server.js code
2022-10-20 13:32:12 -07:00
Micael Jarniac 3a2e9e38b6
Typo fixes (#15895) 2022-10-18 09:24:23 +02:00
Akira Aso eaa8a0748b
Refine a paragraph of docker ps in Go and Python (#15873)
* Refine a paragraph of docker ps in Go and Python

* Fix typo in paragraphs about the docker ps command
2022-10-17 09:27:22 -07:00
Craig Osterhout 217166a8d8
add reminder to stop containers (#15868) 2022-10-14 09:50:22 -07:00
Craig Osterhout 912608daad
removing debugging references (#15863) 2022-10-13 08:55:25 -07:00
Daniel Schroeder 2706acd2ec
Update develop.md (#15829)
There is no logic in that Flask app to save widgets, so I reworded the two sentences that referenced saving widgets. 

There are two routes:
1. `/widgets` -> Gets all the rows from the `widgets` table
2. `/initdb` -> Drops the DB/Table and rebuilds them from scratch
2022-10-11 14:14:12 -07:00
Akira Aso 0d14bcb8c3
Make a paragraph about docker ps concise (#15839) 2022-10-11 09:59:32 -07:00
Daniel Schroeder add70f8a4b
Format `docker build` as a code sample (#15808)
To stay consistent with other uses in the docs, it would make sense for `docker build` to be formatted as code here.
2022-10-05 13:26:31 +00:00
Daniel Schroeder 361c88ae9f
Update wording around removing a container (#15809)
The original used "simple" instead of "simply". I edited the sentence a bit more to make it read clearer and removed that word altogether.
2022-10-05 13:26:04 +00:00
ming 50d76362e8
Update develop.md (#14315)
* Update develop.md

this makes it clear that it is the "volumes" that can sync local code changes to that in the container.

* Update language/nodejs/develop.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-09-30 12:40:59 +01:00
meni181818 a7a9824350
python indentation 4 spaces according to PEP8 (#15129)
* python indetation 4 spaces acording to PEP8

* docker-compose example networking explanation

exlpain why no need to connect the 2 containers to a network
2022-09-30 09:22:56 +00:00
CrazyMax 561118ec5b
rename docs repository
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-29 11:07:53 +02:00
Craig Osterhout ab0a1f692d
Merge pull request #15730 from firgun/patch-2
Fix typos, tone and brevity
2022-09-23 12:57:15 -07:00
Keagan Roos 4f927ed277
Fix typos, tone and brevity 2022-09-23 16:44:59 +02:00
Keagan Roos 70b26ae9f3
Fix typo
Change "return" to "returning".
2022-09-23 16:22:03 +02:00
Craig Osterhout 3d32a4eca7
Merge pull request #15657 from craig-osterhout/15646-java-issue
Issue-15646: Java language specific guide issue
2022-09-21 15:07:12 -07:00
CrazyMax d775c8a6bf
build: multi-stage builds
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-15 13:37:37 +02:00
craig-osterhout 49597b8bbd
add depends_on 2022-09-14 10:11:24 -07:00
Craig Osterhout cf480fae08
rename branch and add note (#15378) 2022-08-23 13:43:03 -07:00
Craig Osterhout 318c432692
[Issue-15424] Python language-specific guide fix (#15436)
*remove base image from container list in python language-specific guide
2022-08-23 13:42:14 -07:00
gaoagong e097432e2c
Word Change (#15420) 2022-08-18 11:46:53 -07:00
Craig Osterhout 8b5cf33e2f
fix formatting for issue 15365 (#15368) 2022-08-12 10:01:05 +01:00
Craig Osterhout 4231acfd40
[ENGDOCS-864] Update java language-specific guide (#15269)
* Updated java guide

* Update language/java/develop.md

Co-authored-by: Guillaume Lours <guillaume@lours.me>

* Update language/java/develop.md

Co-authored-by: Guillaume Lours <guillaume@lours.me>

* moved multi-stage Dockerfile to develop section

Co-authored-by: Guillaume Lours <guillaume@lours.me>
2022-08-03 13:55:57 -07:00
CrazyMax 02d195dcb7
Merge pull request #15276 from crazy-max/rm-absolute-links
remove most of absolute urls
2022-08-03 12:30:39 +02:00
CrazyMax 09c9f51bcf
remove most of absolute urls
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-08-03 11:50:33 +02:00
Roberto Villarreal ad96551b60
Fix spelling mistake in golang docs (#15305) 2022-08-03 10:15:28 +01:00
Justin Chadwell ad45d2d936 lint: tidy spaces inside spans 2022-07-28 11:27:10 +01:00
Justin Chadwell 749d27b40d lint: tidy up consistent header styles 2022-07-28 11:27:10 +01:00
Allie Sadler ab0dee78a2
merge dashboard and user manual (#15145)
* merge dashboard and user manual

* fix broken links

* fix broken links

* fix broken links

* updates

* fixes
2022-07-19 15:40:54 +01:00
CrazyMax 2482f8ce04
Remove unneeded <br> HTML tags
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-14 19:54:47 +02:00
Grant Mitchell 00cc2961b7
added what file type the github actions is
I added this as it might be confusing for some people who dont write in yaml every day to know what file it is. it is best to explicitly state what file type it is
2022-06-23 13:57:51 -07:00
Pedro Pessoa e22fab1ab0
style inconsistency in `--publish flag`
the code part is just `--publish`, so "flag" should be normal text, as in other parts of the text
2022-06-16 15:14:01 -03:00
Jerae Duffin 7f9b8c7392 fixed typo 2022-05-12 15:46:52 -05:00
Usha Mandya 5c5ba79b74 Remove the request new guide issue link
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-04-26 23:46:13 +01:00
Sebastiaan van Stijn cc62b154b8
language/java: fix code-hint to use the correct language
This block now shows java code, so changing the code-hint to make
sure it's highlighted correctly.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-12 11:56:01 +02:00
Usha Mandya 3e55e4ab63
Merge pull request #14352 from giudega/updateTests
removed reference to code line
2022-04-08 11:25:28 +01:00
Giuseppe De Gaetano 60bd96d506
Merge branch 'docker:master' into master 2022-03-27 23:24:03 +02:00
Dovydas Lozys 5edae78bdd
fixes typos 2022-03-25 17:58:00 +00:00
Usha Mandya c82853feb5
Merge pull request #14402 from OusSaidi/patch-1
Fix small typo
2022-03-23 09:49:40 +00:00
Nicholas Rasi a3b576c0a8
Fix Small Typo 2022-03-19 18:38:49 +01:00
OusSaidi c8d0d5c8f8
Fix small typo 2022-03-17 16:41:46 +01:00
Giuseppe De Gaetano 03cd16c2df removed reference to code line 2022-03-06 23:51:45 +01:00
Giuseppe De Gaetano 64ffe96450 removed reference to code line number 2022-03-06 19:55:48 +01:00
Usha Mandya 8d2682cac0
Merge pull request #13898 from humphd/patch-1
Update run-tests.md
2022-02-25 11:49:44 +00:00
Usha Mandya 1c402e7fbf
Merge pull request #14272 from ValeriiMakhniuk/patch-1
add link to volumes.md docs
2022-02-25 11:04:47 +00:00
Usha Mandya 9c63f89aac
Update language/nodejs/develop.md 2022-02-25 11:01:06 +00:00
OGUNSOLA USMAN ADEBAYO f5ed385f5b
Update develop.md (#14025)
* Update develop.md

- provided more clarity to the structure of the mongo database connection string used as CONNECTIONSTRING environment variable to run the docker image in the sample node.js project.

* Update develop.md
2022-02-24 14:15:46 +00:00
Usha Mandya 3d884a7138
Merge pull request #14235 from danBamikiya/configure-ci/cd-reorder
Ammend PAT setup section in Go language guide
2022-02-24 14:15:03 +00:00
Valerii Makhniuk 6617ca3c95
add link to volumes.md docs 2022-02-16 20:32:31 +03:00
Jake Levirne 3d9c6aff71
Minor typo - fixed case 2022-02-13 17:10:21 -05:00
Stefan Scherer bcc2a90f52
Use host port 8000 to avoid conflicts on Monterey
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2022-02-09 13:05:34 +01:00
Dan Bámíkíyá 89ded65463
Ammend PAT setup section in Go language guide 2022-02-06 17:20:23 +01:00
Rayed Bin Wahed 122645e717
Update develop.md
Accidental subject-verb agreement error. Made the verb singular to agree with the singular subject Docker.
2022-02-02 12:00:38 +08:00
HARIHARAN E 65ddb87fd0
modify yoda_notes to notes at line 85 2022-01-21 12:49:03 +05:30
vuurball a93c040494
Update develop.md
typo fix
2022-01-16 14:30:06 +02:00
Usha Mandya 64cd649161
Merge pull request #14061 from bigsky-033/patch-1
Fix typo on PGDATABASE environment variable
2022-01-14 14:31:52 +05:30
Taemin Park 3d775401b8
Fix typo on PGDATABASE environment variable
Add colon on PGDATABASE
2021-12-31 17:05:18 +09:00
Kyle Martin 57b5a647ad
Very minor style update to included sample Python
Inconsequential and trivial change to ensure code in tutorial is consistently styled.
2021-12-27 19:20:04 -07:00
Santiago Rodriguez 2dd8f20546
small typo 2021-12-25 05:19:08 -04:00
David Humphrey 929daf72d6
Update run-tests.md
Fixed a couple of typos.
2021-11-26 21:32:20 -05:00
Dan Bamikiya 2452b40e9a
Remove usage of outdated `GHCR_TOKEN` (#13710)
* Remove usage of outdated GHCR_TOKEN

* Prefer {{ github.actor }} over {{ github.repository_owner }}

* Update language/java/configure-ci-cd.md with note about GITHUB_TOKEN

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update language/nodejs/configure-ci-cd.md with note about GITHUB_TOKEN

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update language/python/configure-ci-cd.md with note about GITHUB_TOKEN

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-11-26 12:38:53 +00:00
Dan Bamikiya cc5d5db7c5
Explain the use of the `COPY` command in the NodeJS example (#13711)
* Explain the use of the COPY command in nodejs example

* Format updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-11-19 12:18:37 +00:00
Usha Mandya 52d182a483
Merge pull request #13828 from rkbodenner/patch-1
Clearer purpose and contents for .dockerignore
2021-11-17 15:01:35 +00:00
Usha Mandya 57639274cd
Update build-images.md 2021-11-17 14:33:01 +00:00
Sebastiaan van Stijn a045d5d100
Merge pull request #13727 from califken/patch-2
Update run-containers.md
2021-11-11 15:02:18 +01:00
Ralph Bodenner b90deff361
Clearer purpose and contents for .dockerignore
I had to read the original paragraph a few times and search for docs on the file's purpose to understand what this step entailed. So here's another try at an explanation of what to do and why, with a hint about best practice.
2021-11-10 23:48:18 -08:00
seungwonleee 5131e29bfd Fix typo Language-specific guides / Nodejs / Run your tests 2021-11-06 02:30:41 +09:00
seungwonleee 0056623a58 Fix typo Language-specific guides / Nodejs / Run containers 2021-11-06 02:29:30 +09:00
Kenneth Caple f1242413b7
Update run-containers.md 2021-10-23 14:10:04 -07:00
Sebastiaan van Stijn d7e9ac275f
Some touch-ups in language get-started
- wrap lines in the java and golang getting started
- make the "test on the host" step in the Java getting started "optional". This
  allows users to try the tutorial without requiring them to set up a functional
  Java environment on their host. (i'm planning on making similar changes in
  the other language guides).
- use `docker <object> <action>` in some examples (but mention the corresponding
  shorthands); this may help understand the relation between the `<action>` and
  what kind of `<object>` we're acting on (tag an _image_, remove an _image_).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-13 16:30:58 +02:00
Usha Mandya d8a91fd44b
Merge pull request #13490 from mafreud/patch-1
Update run-containers.md
2021-10-04 10:46:59 +01:00
Usha Mandya 9a4eb3a8a6
Merge pull request #13507 from idjaw/update-docs-pip-freeze
Improves how requirements.txt is managed in Python tutorial #13506
2021-10-04 10:06:09 +01:00
Stan Manilov 3e5032813f Remove outdated sentence
The output following the sentence no longer contains what the sentence
claims.
2021-09-16 22:18:57 +03:00
Wajdi Al-Hawari a9a8311643 Improves how requirements.txt is created
- To reduce the error prone process of grabbing all Python packages in the global Python scope, the specific package is extracted and set in to the requirements.txt file
2021-09-11 16:30:23 -04:00
Masahiro Aoki 9dd353952b
Update run-containers.md 2021-09-09 13:54:54 +09:00
Sebastiaan van Stijn fbd8c365c8
language/nodejs: un-wrap JSON in example to allow copying
The JSON string was wrapped, causing the highlighter to consider it "output",
which cannot be selected/copied in "console" blocks.

This unwraps the JSON so that it can be copied.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 16:56:29 +02:00
Sebastiaan van Stijn 81177c8b02
fix language guides markup
- force "nowrap"
- add "col-xs-12" to fix size on smaller sizes
- remove the "component-icon" div, as it was not styled

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 13:53:22 +02:00
Sebastiaan van Stijn 60709ed648
Merge pull request #13423 from arvind-007/patch-1
Update build-images.md
2021-08-27 16:05:39 +02:00
Usha Mandya 2feae0d569
Merge pull request #13410 from thaJeztah/go_get_started_touchups
guides: use include for "create a Dockerfile" sections
2021-08-27 14:54:49 +01:00
arvind-007 23b029e358
Update build-images.md 2021-08-27 15:27:55 +05:30
Sebastiaan van Stijn d1fbf5c959
guides: use include for "create a Dockerfile" sections
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-25 13:42:32 +02:00
shayan-7 2b5a5618a1
Found more typos and grammar issues 2021-08-23 22:04:22 +04:30
shayan-7 6a118534ab
Fix a typo 2021-08-23 21:06:00 +04:30
Sebastiaan van Stijn 1583678203
Add missing code-hints, and minor markdown edits
- Add missing code-hints (console, yaml)
- Consistently add an empty line after code-blocks
- Combine some examples where the output and the command were
  put in separate blocks. With the "console" code-hint, this
  is no longer nescessary.
- fix indentation in cloud/ecs-integration.md, which caused the
  numbered-list to be interrupted.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-16 12:59:23 +02:00
kurama f4655fb89e
fix: typo (#13348)
* fix: typo

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-08-16 11:57:31 +01:00
DJ Adams 5dd725fb4f
add explicit instruction to stop local server (#13235)
* add explicit instruction to stop local server

This relates to the [Test the application section of the Build images tutorial](https://docs.docker.com/language/nodejs/build-images/#test-the-application). 

In this section, `node server.js` is used to start the server locally. The reader is not instructed to stop the server. 

In the [Run containers](https://docs.docker.com/language/nodejs/run-containers/) tutorial that follows this one, the reader is instructed to start up the container, and try to access `http://localhost:8000/test` which is now being served from the Node.js process inside the container. However, if the local Node.js process from the `node server.js` invocation earlier, they won't see the "Failed to connect to localhost port 8000" error which they're supposed to see. 

So this modification adds an explicit instruction to the "Build containers" tutorial to stop the `node server.js` process, to avoid any potential confusion in the "Run containers" tutorial.

Great tutorials, btw!

* show what happens with Ctrl-c

add suggestions from @thaJeztah, plus the same language identifier on the triple-backtick quoted output earlier (`console`).

* Minor styling updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2021-08-09 11:26:37 +01:00
Sebastiaan van Stijn 74460241f8
language/python: use "console" for shell examples
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 17:20:00 +02:00
Sebastiaan van Stijn 60bb48a6a1
language/nodejs: use "console" for shell examples
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 17:19:59 +02:00
Sebastiaan van Stijn 38b629bcb2
language/java: use "console" for shell examples
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 17:19:58 +02:00
Sebastiaan van Stijn 0ceace875d
language/golang: use "console" for shell examples
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 17:19:58 +02:00
Sebastiaan van Stijn 7e9fdf93fe
language/golang: fix some broken links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-06 11:52:13 +02:00
Jerae Duffin 326b8efe9e updated volumes link 2021-08-05 21:58:55 -05:00
Jerae Duffin ed5cad4884 fixed broken link 2021-08-05 21:48:27 -05:00
Usha Mandya 0d5e3ecf82
Merge pull request #13266 from dodsonmg/fix_golang_release_workflow
golang: Fix username mismatch issue in tutorial GitHub workflow
2021-08-03 15:53:14 +01:00
Usha Mandya d7bd7353b3 Add K8s to the deploy app section
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2021-08-03 14:20:27 +01:00
dodsonmg 65587b2239 Fix username mismatch issue in GitHub workflow
Correctly handles mismatch between GitHub and Docker Hub usernames.
2021-08-01 13:46:39 +01:00
Aaryan Porwal 6531e8ef21
Update build-images.md (#12843)
* Update build-images.md

Small typos in the documentation, which may lead to confusion.

* Inspiration from node.js docs

Added documentation for why we copy `package*.json` before copying the whole directory. Checkout: https://nodejs.org/en/docs/guides/nodejs-docker-webapp/#creating-a-dockerfile. 
The node.js docs has more optimized code too (using `npm ci` instead of `npm install`) which can be used here too.

* Fixed review provided and removed some weird whitespaces
2021-07-30 13:56:05 +01:00
Usha Mandya 347073cfd2
Merge pull request #13253 from mnahinkhan/patch-2
Update configure-ci-cd.md
2021-07-30 10:16:46 +01:00
Sebastiaan van Stijn 568308c890
Merge pull request #13236 from qmacro/patch-2
be explicit about having a breakpoint-able line
2021-07-30 11:15:53 +02:00