projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes I1d0ee897,Iee1ed292
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
d8866e5
..
621664a
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-60,7
+60,7
@@
services:
networks:
- netOSM
keystone:
networks:
- netOSM
keystone:
- image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
6
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-70,7
+70,7
@@
services:
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
- image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
6
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-86,7
+86,7
@@
services:
# - kafka
# - mongo
lcm:
# - kafka
# - mongo
lcm:
- image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
6
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-114,7
+114,7
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
6
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-128,7
+128,7
@@
services:
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
- image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
6
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-148,7
+148,7
@@
services:
max-file: 5
max-size: 10m
pol:
max-file: 5
max-size: 10m
pol:
- image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
6
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-167,7
+167,7
@@
services:
max-file: 5
max-size: 10m
light-ui:
max-file: 5
max-size: 10m
light-ui:
- image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
5
}
+ image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
6
}
networks:
- netOSM
environment:
networks:
- netOSM
environment: