Skip to content

Commit abbf6f7

Browse files
authored
Merge pull request egen#64 from joonas/tutorial_35/fix_readme
Update README to reflect the current configuration
2 parents 42e93d5 + b393439 commit abbf6f7

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

35_push_docker_image/README.md

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,44 @@ The pipeline is below:
3030

3131
```yaml
3232
jobs:
33-
jobs:
34-
- name: job-publish
35-
public: true
36-
serial: true
37-
plan:
38-
- get: resource-tutorial
39-
- put: hello-world-docker-image
40-
params:
41-
build: resource-tutorial/35_push_docker_image/docker
42-
43-
resources:
44-
- name: resource-tutorial
45-
type: git
46-
source:
47-
uri: https://github.com/drnic/concourse-tutorial.git
33+
- name: job-publish
34+
public: true
35+
serial: true
36+
plan:
37+
- get: resource-tutorial
38+
- put: hello-world-docker-image
39+
params:
40+
build: resource-tutorial/35_push_docker_image/docker
41+
42+
resources:
43+
- name: resource-tutorial
44+
type: git
45+
source:
46+
uri: https://github.com/drnic/concourse-tutorial.git
4847

4948
- name: hello-world-docker-image
5049
type: docker-image
5150
source:
52-
email: DOCKER_EMAIL
53-
username: DOCKER_USERNAME
54-
password: DOCKER_PASSWORD
55-
repository: drnic/hello-world
51+
email: {{docker-hub-email}}
52+
username: {{docker-hub-username}}
53+
password: {{docker-hub-password}}
54+
repository: {{docker-hub-image-hello-world}}
5655
```
5756
5857
Since the source `Dockerfile` is actually within this tutorial's own git repo, we will use this tutorial repo as the input resource called `resource-tutorial`. In the job `job-publish` build plan we `get` it first; and it is used by the `hello-world-docker-image` docker-image resource next.
5958

60-
This means the `docker` subfolder in this tutorial section will be available at folder `resource-tutorial/51_dummy_resource_docker_image/docker` during the build plan (`resource-tutorial` is the name of the resource within the job build plan; and `51_dummy_resource_docker_image/docker` is the subfolder where the `Dockerfile` is located).
59+
This means the `docker` subfolder in this tutorial section will be available at folder `resource-tutorial/35_push_docker_image/docker` during the build plan (`resource-tutorial` is the name of the resource within the job build plan; and `35_push_docker_image/docker` is the subfolder where the `Dockerfile` is located).
6160

6261
Running the pipeline
6362
--------------------
6463

6564
Your `credentials.yml` now needs your Docker Hub account credentials (see `credentials.example.yml`\):
6665

6766
```yaml
68-
meta:
69-
docker:
70-
email: EMAIL
71-
username: USERNAME
72-
password: PASSWORD
67+
docker-hub-email: EMAIL
68+
docker-hub-username: USERNAME
69+
docker-hub-password: PASSWORD
70+
docker-hub-image-hello-world: USERNAME/hello-world
7371
```
7472

7573
The `run.sh` will create the pipeline.yml and upload it to Concourse,

0 commit comments

Comments
 (0)