Dockerfile

Merge pull request #134 from docker/dependabot/pip/pygments-2.7.4
Bump pygments from 2.6.1 to 2.7.4
2021-09-07 17:11:20 -06:00 · 2021-05-06 07:34:25 +02:00 · 2021-05-06 07:30:51 +02:00 · 2021-03-31 15:30:29 +00:00 · 2021-03-29 22:08:19 +00:00 · 2021-03-09 08:50:32 +00:00
8 changed files with 22 additions and 13 deletions
--- a/README.md
+++ b/README.md
@@ -37,6 +37,6 @@ docker-compose up

 If you find typos or other issues with the tutorial, feel free to create a PR and suggest fixes!

-If you have ideas on how to make the tutorial better or new content, please open an issue first before working on your idea. While we love input, we want to keep the tutorial  scoped to new-comers.
+If you have ideas on how to make the tutorial better or new content, please open an issue first before working on your idea. While we love input, we want to keep the tutorial  scoped to newcomers.
 As such, we may reject ideas for more advanced requests and don't want you to lose any work you might
 have done. So, ask first and we'll gladly hear your thoughts!
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -0,0 +1,7 @@
+# syntax=docker/dockerfile:1
+FROM node:12-alpine
+RUN apk add --no-cache python g++ make
+WORKDIR /app
+COPY . .
+RUN yarn install --production
+CMD ["node", "src/index.js"]
--- a/app/src/static/index.html
+++ b/app/src/static/index.html
@@ -8,9 +8,10 @@
    <link rel="stylesheet" href="css/font-awesome/all.min.css" crossorigin="anonymous" />
    <link href="https://fonts.googleapis.com/css?family=Lato&display=swap" rel="stylesheet" />
    <link rel="stylesheet" href="css/styles.css" />
-    <title>Todo App</title>
+    <title>Lista de compras</title>
 </head>
 <body>
+    <center><h2>Lista de Compras</h2></center>
    <div id="root"></div>
    <script src="js/react.production.min.js"></script>
    <script src="js/react-dom.production.min.js"></script>
--- a/app/src/static/js/app.js
+++ b/app/src/static/js/app.js
@@ -53,7 +53,7 @@ function TodoListCard() {
        <React.Fragment>
            <AddItemForm onNewItem={onNewItem} />
            {items.length === 0 && (
-                <p className="text-center">No items yet! Add one above!</p>
+                <p className="text-center">Adicionar um item</p>
            )}
            {items.map(item => (
                <ItemDisplay
@@ -96,7 +96,7 @@ function AddItemForm({ onNewItem }) {
                    value={newItem}
                    onChange={e => setNewItem(e.target.value)}
                    type="text"
-                    placeholder="New Item"
+                    placeholder="Novo produto"
                    aria-describedby="basic-addon1"
                />
                <InputGroup.Append>
@@ -106,7 +106,7 @@ function AddItemForm({ onNewItem }) {
                        disabled={!newItem.length}
                        className={submitting ? 'disabled' : ''}
                    >
-                        {submitting ? 'Adding...' : 'Add Item'}
+                        {submitting ? 'Adding...' : 'OK'}
                    </Button>
                </InputGroup.Append>
            </InputGroup>
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -1770,9 +1770,9 @@ inherits@2.0.3:
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

 ini@^1.3.4, ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==

 invariant@^2.2.4:
  version "2.2.4"
@@ -4366,9 +4366,9 @@ xml-name-validator@^3.0.0:
  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==

 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==

 yallist@^2.1.2:
  version "2.1.2"
--- a/docs/tutorial/our-application/index.md
+++ b/docs/tutorial/our-application/index.md
@@ -38,6 +38,7 @@ see a few flaws in the Dockerfile below. But, don't worry! We'll go over them.

    ```dockerfile
    FROM node:12-alpine
+    RUN apk add --no-cache python g++ make
    WORKDIR /app
    COPY . .
    RUN yarn install --production
--- a/docs/tutorial/using-bind-mounts/index.md
+++ b/docs/tutorial/using-bind-mounts/index.md
@@ -14,7 +14,7 @@ changes and then restart the application. There are equivalent tools in most oth
 ## Quick Volume Type Comparisons

 Bind mounts and named volumes are the two main types of volumes that come with the Docker engine. However, additional
-volume drivers are available to support other uses cases ([SFTP](https://github.com/vieux/docker-volume-sshfs), [Ceph](https://ceph.com/geen-categorie/getting-started-with-the-docker-rbd-volume-plugin/), [NetApp](https://netappdvp.readthedocs.io/en/stable/), [S3](https://github.com/elementar/docker-s3-volume), and more).
+volume drivers are available to support other use cases ([SFTP](https://github.com/vieux/docker-volume-sshfs), [Ceph](https://ceph.com/geen-categorie/getting-started-with-the-docker-rbd-volume-plugin/), [NetApp](https://netappdvp.readthedocs.io/en/stable/), [S3](https://github.com/elementar/docker-s3-volume), and more).

 |   | Named Volumes | Bind Mounts |
 | - | ------------- | ----------- |
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 mkdocs==1.0.4
 mkdocs-material==4.6.3
 mkdocs-minify-plugin==0.2.3
-pygments==2.6.1
+pygments==2.7.4
 pymdown-extensions==7.0
Author	SHA1	Message	Date
Adolfo Delorenzo	c9337417ae	Dockerfile	2021-09-07 17:11:20 -06: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