Commit Graph

88 Commits

Author SHA1 Message Date
António Alvarenga
f390971d25
enclose code block in backticks 2021-05-07 11:31:51 +01:00
António Alvarenga
64a1666f12
Merge pull request #1 from antalvarenga/antalvarenga-patch-1
Multi-container apps: add workaround for non amd64 machines
2021-05-07 11:28:16 +01:00
António Alvarenga
5d5e551104
Multi-container apps: add workaround for non amd64 machines 2021-05-07 11:26:18 +01:00
Stefan Scherer
13386236e4
Merge pull request #134 from docker/dependabot/pip/pygments-2.7.4
Bump pygments from 2.6.1 to 2.7.4
2021-05-06 07:34:25 +02:00
Stefan Scherer
2376af82e7
Merge pull request #135 from docker/dependabot/npm_and_yarn/app/y18n-4.0.1
Bump y18n from 4.0.0 to 4.0.1 in /app
2021-05-06 07:30:51 +02:00
dependabot[bot]
e991a5ab73
Bump y18n from 4.0.0 to 4.0.1 in /app
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-31 15:30:29 +00:00
dependabot[bot]
62e2117581
Bump pygments from 2.6.1 to 2.7.4
Bumps [pygments](https://github.com/pygments/pygments) from 2.6.1 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.6.1...2.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-29 22:08:19 +00:00
Alex White
4b6b5476c5 Update README.md 2021-03-09 08:50:32 +00:00
zipperer
e43a605d37 Edit docs/tutorial/using-bind-mounts/index.md
'uses cases' |-> 'use cases'
2021-03-09 08:49:09 +00:00
Stefan Scherer
eccb882c59 Add build tools to fix arm64 build issue
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-03-09 08:47:47 +00:00
Stefan Scherer
3de6451f5c
Merge pull request #104 from StefanScherer/build-arm64
Build amd64 and arm64 image
2020-12-10 19:42:46 +01:00
Stefan Scherer
b66f1c3224
Build amd64 and arm64 image
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-12-10 12:34:01 +01:00
Stephen Turner
23e02b9a44
Add section on vulnerability scanning (#98)
* Update index.md

* Add files via upload

* Update index.md

* Update docs/tutorial/image-building-best-practices/index.md

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

* Update index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-11-02 12:24:36 +00:00
dependabot[bot]
5cccd65849 Bump yargs-parser from 13.1.1 to 13.1.2 in /app
Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 13.1.1 to 13.1.2.
- [Release notes](https://github.com/yargs/yargs-parser/releases)
- [Changelog](https://github.com/yargs/yargs-parser/blob/master/docs/CHANGELOG-full.md)
- [Commits](https://github.com/yargs/yargs-parser/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-22 14:54:02 +01:00
Tony Brown
9646231353 Update multi-container-apps env vars security typo 2020-10-22 09:07:54 +01:00
Tim Gibson
3cbe2e686e Update README.md 2020-10-22 09:04:31 +01:00
Stefan Scherer
172c616131
Merge pull request #81 from mat007/build-github-action
Add github action to build
2020-09-30 16:35:34 +02:00
Stefan Scherer
6190776cb6
Merge pull request #77 from Fl4zher/fix-typo
fixing typo
2020-08-31 07:21:30 +02:00
Mathieu Champlon
3323acf03e Add github action to build
This makes sure the project builds correctly.
2020-08-27 11:01:06 +02:00
Stefan Scherer
559d5f335e
Merge pull request #73 from veyndan/patch-1
Fix typo
2020-08-25 12:16:01 +02:00
Stefan Scherer
6916e6a595
Merge pull request #78 from coreygarvey/patch-1
Update docs w/ missing "to"
2020-08-25 12:14:38 +02:00
Corey Garvey
bb961ef28d
Update docs w/ missing "to"
Missing word in the docs
2020-08-15 11:15:52 +01:00
Harun Kilic
0b402b3ebf
fixing typo 2020-08-07 02:09:28 +02:00
Veyndan Stuart
4ed7232ea2
Fix typo 2020-08-01 20:45:52 +02:00
Stefan Scherer
9f31a47053
Merge pull request #72 from docker/dependabot/npm_and_yarn/app/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /app
2020-07-20 20:04:57 +02:00
dependabot[bot]
b1d106ea7c
Bump lodash from 4.17.15 to 4.17.19 in /app
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-19 17:31:36 +00:00
Stefan Scherer
288a57ea63
Merge pull request #71 from StefanScherer/fix-jenkinsfile
Fix build command
2020-07-15 09:00:05 +02:00
Stefan Scherer
f232e36815
Fix build command
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-07-15 08:59:02 +02:00
Stefan Scherer
fe2686fe00
Merge pull request #70 from StefanScherer/powershell
Show multiline PowerShell commands
2020-07-15 08:55:44 +02:00
Stefan Scherer
a33ed89ab3
Quote volume mapping and use pwd
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-07-15 08:45:25 +02:00
Stefan Scherer
f77065be98
Show multiline PowerShell commands
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-07-15 08:20:44 +02:00
Stefan Scherer
3641a64e81
Merge pull request #65 from mattlevan/patch-1
Fix slightly snide comment about SQLite
2020-07-08 18:13:24 +02:00
Stefan Scherer
7cca5d6984
Merge pull request #66 from ffe4/patch-1
Fix typo in tutorial
2020-07-08 18:12:26 +02:00
Stefan Scherer
12a64fad04
Merge pull request #54 from klintzz/patch-1
Dockerfile CMD path fix
2020-07-08 18:11:35 +02:00
Kevin Lin
631465eee2
Removed leading slash
Minor fix
2020-07-08 08:52:39 -07:00
Stefan Scherer
d4da770c2f
Merge pull request #68 from StefanScherer/beginners-compatible-run-command
Use single shorthand flags, better for beginners
2020-07-03 11:41:16 +02:00
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
Daniel
3cf57a72b8
Fix typo in tutorial 2020-07-01 10:57:14 +02:00
Matthew Levan
f21aca690b
Fix slightly snide comment about SQLite
The original language implies that SQLite is not an "actual" database engine, which is of course not the case! SQLite is a very capable and ubiquitous database engine. It's not appropriate for many applications, though, so perhaps the document here can simply read "different" rather than "actual". I recognize this is a bit particular, but hey-- that's how I perceived the language on my first read, and I don't even particularly like (or use) SQLite anyways! I do respect the technology, though, and thought it'd be kind to change the language so as to remove all possibility of misinterpretation.
2020-06-30 09:50:26 -07:00
Stefan Scherer
823b0d4642
Merge pull request #49 from Terag/master
Removes timeout on mysql connection
2020-06-29 20:51:19 +02:00
Kevin Lin
67a914066f
CMD update 2020-06-29 09:37:25 -07:00
Kevin Lin
28b0c3ccad
Additional CMD updates for dockerfiles 2020-06-29 09:30:32 -07: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
Kevin Lin
ab74008076
Dockerfile CMD path fix
CMD runs relative to the WORKDIR.
2020-06-04 13:21:09 -07: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