Skip to content

Commit fd0ad63

Browse files
make the task a bit more generic
1 parent cfe2b19 commit fd0ad63

File tree

4 files changed

+30
-25
lines changed

4 files changed

+30
-25
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Maven Resource
22

3-
[![ci.anvil.pcfdemo.com](https://ci.anvil.pcfdemo.com/api/v1/teams/pcrocker/pipelines/maven-resource/jobs/build/badge)](https://ci.anvil.pcfdemo.com/teams/pcrocker/pipelines/maven-resource) [docker](https://hub.docker.com/r/patrickcrocker/maven-resource/)
3+
[![CI Build](https://wings.concourse.ci/teams/sme-pcf-concourse/pipelines/maven-resource/jobs/build/badge)](https://ci.anvil.pcfdemo.com/teams/pcrocker/pipelines/maven-resource)
4+
[![Docker Pulls](https://img.shields.io/docker/pulls/mashape/kong.svg)](https://hub.docker.com/r/pivotalpa/maven-resource/)
45

56
Deploys and retrieve artifacts from a Maven Repository Manager.
67

@@ -43,7 +44,7 @@ resource_types:
4344
- name: maven-resource
4445
type: docker-image
4546
source:
46-
repository: patrickcrocker/maven-resource
47+
repository: pivotalpa/maven-resource
4748
tag: latest
4849
4950
resources:

ci/generate-docker-tags.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set -e
44

55
version=$(cat version/version)
66

7-
echo $version > generate-docker-tags-output/tag-alpine
8-
echo "$version-debian" > generate-docker-tags-output/tag-debian
7+
echo $version > task-output/tag-alpine
8+
echo "$version-debian" > task-output/tag-debian

ci/generate-docker-tags.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ image_resource:
88
tag: '1.26'
99

1010
inputs:
11-
- name: maven-resource
11+
- name: project
1212
- name: version
1313

1414
outputs:
15-
- name: generate-docker-tags-output
15+
- name: task-output
1616

1717
run:
18-
path: maven-resource/ci/generate-docker-tags.sh
18+
path: project/ci/generate-docker-tags.sh

pipeline.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,26 @@ jobs:
55
serial_groups: [version]
66
plan:
77
- aggregate:
8-
- get: maven-resource
8+
- get: project
9+
resource: maven-resource
910
trigger: true
1011
- get: version
1112
params: {pre: rc}
1213
- task: generate-docker-tags
13-
file: maven-resource/ci/generate-docker-tags.yml
14+
file: project/ci/generate-docker-tags.yml
15+
output_mapping: {task-output: generate-docker-tags-output}
1416
- put: version
1517
params: {file: version/version}
1618
- put: maven-resource-image-rc
1719
params:
18-
build: maven-resource
19-
dockerfile: maven-resource/Dockerfile
20+
build: project
21+
dockerfile: project/Dockerfile
2022
tag: generate-docker-tags-output/tag-alpine
2123
tag_as_latest: false
2224
- put: maven-resource-image-rc
2325
params:
24-
build: maven-resource
25-
dockerfile: maven-resource/debian/Dockerfile
26+
build: project
27+
dockerfile: project/debian/Dockerfile
2628
tag: generate-docker-tags-output/tag-debian
2729
tag_as_latest: false
2830
- put: tracker
@@ -35,7 +37,7 @@ jobs:
3537
serial_groups: [version]
3638
plan:
3739
- aggregate:
38-
- get: concourse-commons
40+
- get: pipeline-tasks
3941
- get: project
4042
resource: maven-resource
4143
passed: [build]
@@ -46,11 +48,13 @@ jobs:
4648
passed: [build]
4749
params: {bump: final}
4850
- task: generate-docker-tags
49-
file: maven-resource/ci/generate-docker-tags.yml
51+
file: project/ci/generate-docker-tags.yml
5052
- task: generate-github-release
51-
file: concourse-commons/tasks/generate-github-release.yml
53+
file: pipeline-tasks/generate-github-release/task.yml
54+
output_mapping: {task-output: generate-github-release-output}
5255
- task: generate-commitish
53-
file: concourse-commons/tasks/generate-commitish.yml
56+
file: pipeline-tasks/generate-commitish/task.yml
57+
output_mapping: {task-output: generate-commitish-output}
5458
- put: github-release
5559
params:
5660
name: generate-github-release-output/release-name
@@ -104,8 +108,8 @@ resources:
104108
- name: maven-resource
105109
type: git
106110
source:
107-
uri: {{git-uri}}
108-
branch: {{git-branch}}
111+
uri: {{maven-resource-git-uri}}
112+
branch: {{maven-resource-git-branch}}
109113
private_key: {{git-private-key}}
110114
ignore_paths:
111115
- LICENSE
@@ -118,21 +122,21 @@ resources:
118122
source:
119123
access_token: {{github-release-access-token}}
120124
repository: maven-resource
121-
user: patrickcrocker
125+
user: {{github-release-user}}
122126

123-
- name: concourse-commons
127+
- name: pipeline-tasks
124128
type: git
125129
source:
126-
uri: {{git-concourse-commons}}
127-
branch: master
130+
uri: {{pipeline-tasks-git-uri}}
131+
branch: {{pipeline-tasks-git-branch}}
128132

129133
- name: version
130134
type: semver
131135
source:
132136
driver: git
133137
initial_version: 1.0.0-rc.0
134-
uri: {{git-uri-semver}}
135-
branch: version
138+
uri: {{maven-resource-semver-git-uri}}
139+
branch: {{maven-resource-semver-git-branch}}
136140
file: version
137141
private_key: {{git-private-key}}
138142

0 commit comments

Comments
 (0)