diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-06 11:19:02 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-05-17 15:47:52 +0200 |
| commit | 2c49046ae2e27805c3a5fb205e669017cc910d1c (patch) | |
| tree | e3cc8674d06af6e8534baf580eef7e0e9b8bfe51 /docker | |
| parent | 0506ede84f97159a8156ad51aea395d0868e6141 (diff) | |
| download | kolla-2c49046ae2e27805c3a5fb205e669017cc910d1c.tar.gz kolla-2c49046ae2e27805c3a5fb205e669017cc910d1c.zip | |
Drop monasca-grafana image.
After months of using deprecated components image finally stopped
building.
Change-Id: I8f5a9b220fc8afd6ef07cb5f2142df8c6ead9bc0
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 104 | ||||
| -rw-r--r-- | docker/monasca/monasca-grafana/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/monasca/monasca-grafana/grafana_sudoers | 1 |
3 files changed, 0 insertions, 113 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 deleted file mode 100644 index 9e4c49492..000000000 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ /dev/null @@ -1,104 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block monasca_grafana_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='monasca', homedir='/usr/share/grafana') }} - -{% if base_package_type == 'rpm' %} - {% set monasca_grafana_build_packages = [ - 'bzip2', - 'fontconfig', - 'gcc-c++', - 'git', - 'golang', - 'make', - 'npm', - 'rpm-build', - 'ruby', - 'ruby-devel' - ] %} -{% elif base_package_type == 'deb' %} - {% set monasca_grafana_build_packages = [ - 'bzip2', - 'fontconfig', - 'g++', - 'git', - 'golang', - 'libffi-dev', - 'make', - 'npm', - 'rpm', - 'ruby', - 'ruby-dev' - ] %} -{% endif %} - -{{ macros.install_packages(monasca_grafana_build_packages | customizable("packages")) }} - -WORKDIR /usr/share/grafana - -COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -ENV GO_PATH=/grafana -ENV monasca_grafana_build_path=${GO_PATH}/src/github.com/grafana/grafana -ARG monasca_grafana_version=grafana4_2 -ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz -ARG monasca_grafana_app_version=1.0.0 -ARG monasca_grafana_app_url=https://github.com/monasca/monasca-grafana/archive/$monasca_grafana_app_version.tar.gz - -{% block monasca_grafana_install %} -# NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing. -# NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH. -# This is forced for all distros to avoid conflicts with native packages. -RUN gem install fpm \ - && curl -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \ - && mkdir -p ${monasca_grafana_build_path} \ - && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \ - && rm -f /tmp/monasca-grafana.tgz \ - && cd ${monasca_grafana_build_path} \ - && go run build.go setup \ - && npm config set prefix /usr/local -g \ - && npm install npm@6.x -g \ - && /usr/local/bin/npm install \ - && go run build.go build package \ - && mv ${monasca_grafana_build_path}/dist /grafana_pkgs \ - && rm -rf /grafana - -{% if base_package_type == 'rpm' %} - {% set monasca_grafana_packages = ['/grafana_pkgs/grafana*.rpm'] %} -{% elif base_package_type == 'deb' %} - {% set monasca_grafana_packages = ['/grafana_pkgs/grafana*.deb'] %} -{% endif %} - -{{ macros.install_packages(monasca_grafana_packages | customizable("packages")) }} - -{% endblock %} - -{% block monasca_plugins_install %} - -RUN grafana-cli plugins install monasca-datasource \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \ - && chmod 755 /usr/local/bin/kolla_extend_start - -RUN mkdir -p /var/lib/grafana/plugins/monasca-grafana \ - && curl -o tmp.tgz ${monasca_grafana_app_url} \ - && tar zxvf tmp.tgz -C /var/lib/grafana/plugins/monasca-grafana --strip-components=1 \ - && rm tmp.tgz \ - && npm install -g grunt \ - && cd /var/lib/grafana/plugins/monasca-grafana \ - && npm install \ - && grunt - -{% endblock %} - -{% block monasca_grafana_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER monasca diff --git a/docker/monasca/monasca-grafana/extend_start.sh b/docker/monasca/monasca-grafana/extend_start.sh deleted file mode 100644 index 1f6f8ef60..000000000 --- a/docker/monasca/monasca-grafana/extend_start.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/monasca" ]]; then - mkdir -p /var/log/kolla/monasca -fi -if [[ $(stat -c %a /var/log/kolla/monasca) != "755" ]]; then - chmod 755 /var/log/kolla/monasca -fi diff --git a/docker/monasca/monasca-grafana/grafana_sudoers b/docker/monasca/monasca-grafana/grafana_sudoers deleted file mode 100644 index a8f01423b..000000000 --- a/docker/monasca/monasca-grafana/grafana_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R monasca\: /var/lib/grafana/, /bin/chown -R monasca\: /var/lib/grafana/ |
