Common start.sh
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
Showing
- docker/base/Dockerfile.j2 7 additions, 1 deletiondocker/base/Dockerfile.j2
- docker/base/kolla-common.sh 0 additions, 5 deletionsdocker/base/kolla-common.sh
- docker/base/start.sh 13 additions, 0 deletionsdocker/base/start.sh
- docker/ceilometer/ceilometer-alarm/Dockerfile.j2 0 additions, 5 deletionsdocker/ceilometer/ceilometer-alarm/Dockerfile.j2
- docker/ceilometer/ceilometer-alarm/start.sh 0 additions, 10 deletionsdocker/ceilometer/ceilometer-alarm/start.sh
- docker/ceilometer/ceilometer-api/Dockerfile.j2 3 additions, 6 deletionsdocker/ceilometer/ceilometer-api/Dockerfile.j2
- docker/ceilometer/ceilometer-api/extend_start.sh 0 additions, 9 deletionsdocker/ceilometer/ceilometer-api/extend_start.sh
- docker/ceilometer/ceilometer-central/Dockerfile.j2 1 addition, 6 deletionsdocker/ceilometer/ceilometer-central/Dockerfile.j2
- docker/ceilometer/ceilometer-central/start.sh 0 additions, 10 deletionsdocker/ceilometer/ceilometer-central/start.sh
- docker/ceilometer/ceilometer-collector/Dockerfile.j2 1 addition, 6 deletionsdocker/ceilometer/ceilometer-collector/Dockerfile.j2
- docker/ceilometer/ceilometer-collector/start.sh 0 additions, 10 deletionsdocker/ceilometer/ceilometer-collector/start.sh
- docker/ceilometer/ceilometer-compute/Dockerfile.j2 5 additions, 9 deletionsdocker/ceilometer/ceilometer-compute/Dockerfile.j2
- docker/ceilometer/ceilometer-compute/start.sh 0 additions, 10 deletionsdocker/ceilometer/ceilometer-compute/start.sh
- docker/ceilometer/ceilometer-notification/Dockerfile.j2 0 additions, 5 deletionsdocker/ceilometer/ceilometer-notification/Dockerfile.j2
- docker/ceilometer/ceilometer-notification/start.sh 0 additions, 10 deletionsdocker/ceilometer/ceilometer-notification/start.sh
- docker/ceph/ceph-mon/Dockerfile.j2 2 additions, 2 deletionsdocker/ceph/ceph-mon/Dockerfile.j2
- docker/ceph/ceph-mon/extend_start.sh 0 additions, 6 deletionsdocker/ceph/ceph-mon/extend_start.sh
- docker/ceph/ceph-mon/fetch_ceph_keys.py 0 additions, 0 deletionsdocker/ceph/ceph-mon/fetch_ceph_keys.py
- docker/ceph/ceph-osd/Dockerfile.j2 2 additions, 3 deletionsdocker/ceph/ceph-osd/Dockerfile.j2
- docker/ceph/ceph-osd/extend_start.sh 0 additions, 6 deletionsdocker/ceph/ceph-osd/extend_start.sh
Loading
Please register or sign in to comment