Skip to content

Commit 5014cc6

Browse files
Docker compose/version (#20)
* cfbs has new function to set version number * use replace for settiung version _ is forbidden char
1 parent 662c750 commit 5014cc6

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

cfbs.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
2-
"name": "scl_modules",
2+
"name": "scl-modules",
33
"description": "Repository of modules written by the SURF team",
44
"type": "modules",
55
"provides": {
6-
"promise-type-docker_compose": {
6+
"promise-type-docker-compose": {
77
"description": "Promise type to manage containers using docker compose",
88
"dependencies": ["library-for-promise-types-in-bash"],
99
"subdirectory": "promise-types/docker_compose/",
1010
"version": "master",
1111
"steps": [
1212
"copy docker_compose.sh modules/promises/docker_compose.sh",
13+
"replace 1 0.0.0 1.3.0 modules/promises/docker_compose.sh",
1314
"append enable.cf services/init.cf"
1415
]
1516
},
16-
"promise-type-docker_network": {
17+
"promise-type-docker-network": {
1718
"description": "Promise type to manage networks using docker network",
1819
"dependencies": ["library-for-promise-types-in-bash"],
1920
"subdirectory": "promise-types/docker_network/",

promise-types/docker_compose/docker_compose.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ required_attributes="state"
66
optional_attributes="envfile"
77
all_attributes_are_valid="no"
88

9+
## automaticall set by cfbs
10+
DOCKER_COMPOSE_VERSION="0.0.0"
11+
912

1013
LOG_PREFIX="${0##*/}"
1114

@@ -162,4 +165,4 @@ do_evaluate() {
162165
}
163166

164167
. "$(dirname "$0")/cfengine.sh"
165-
module_main "docker_compose" "1.0"
168+
module_main "docker_compose" "${DOCKER_COMPOSE_VERSION}"

0 commit comments

Comments
 (0)