diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-14 13:28:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-14 13:28:07 +0000 |
| commit | 3dbdbff1e1d87de61adf4317171469ac9ac00bfa (patch) | |
| tree | c1364b776487c857f7c89c1867b9046ad8b1a79e /docker | |
| parent | 9619c6eb1abbf3116080267483a833c740756779 (diff) | |
| parent | 2e2b6f6d3c848042f0b13b0817da9694a91e935c (diff) | |
| download | kolla-3dbdbff1e1d87de61adf4317171469ac9ac00bfa.tar.gz kolla-3dbdbff1e1d87de61adf4317171469ac9ac00bfa.zip | |
Merge "Remove ptp image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ptp/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/ptp/extend_start.sh | 12 |
2 files changed, 0 insertions, 30 deletions
diff --git a/docker/ptp/Dockerfile.j2 b/docker/ptp/Dockerfile.j2 deleted file mode 100644 index c6cc8aaba..000000000 --- a/docker/ptp/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block ptp_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set ptp_packages = ['linuxptp'] %} - -{{ macros.install_packages(ptp_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - -{% block ptp_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/ptp/extend_start.sh b/docker/ptp/extend_start.sh deleted file mode 100644 index 09203991d..000000000 --- a/docker/ptp/extend_start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -rm -f /var/run/ptp.pid - -PTP_LOG_DIR="/var/log/kolla/ptp" -if [[ ! -d "${PTP_LOG_DIR}" ]]; then - mkdir -p ${PTP_LOG_DIR} -fi - -if [[ $(stat -c %a ${PTP_LOG_DIR}) != "755" ]]; then - chmod 755 ${PTP_LOG_DIR} -fi |