From 0e8a71d1cf6d68e0a1202883907a0a87c40a532f Mon Sep 17 00:00:00 2001 From: Nadezhda Fedorova Date: Fri, 7 Jun 2024 17:31:39 +0300 Subject: [PATCH] add branch p11 --- build.py | 2 +- org/alt/grafana/Dockerfile.template | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.py b/build.py index 76cefb2..2e41192 100755 --- a/build.py +++ b/build.py @@ -639,7 +639,7 @@ class ImagesInfo: def parse_args(): stages = ["build", "remove_dockerfiles", "render_dockerfiles", "push"] arches = ["amd64", "386", "arm64"] - branches = ["p10", "sisyphus", "c10f1", "c10f2"] + branches = ["p11", "p10", "sisyphus", "c10f1", "c10f2"] organizations = list(ORG_DIR.iterdir()) images = [f"{o.name}/{i.name}" for o in organizations for i in o.iterdir()] organizations = [o.name for o in organizations] diff --git a/org/alt/grafana/Dockerfile.template b/org/alt/grafana/Dockerfile.template index cbee411..0a31101 100644 --- a/org/alt/grafana/Dockerfile.template +++ b/org/alt/grafana/Dockerfile.template @@ -10,12 +10,12 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team" {{ install_packages( "grafana", -"grafana-dashboards-ceph", +#"grafana-dashboards-ceph", ) }} -RUN echo $'[dashbords.json] \n\ - enabled = true \n\ - path = /var/lib/grafana-dashboards-ceph' > /etc/grafana/grafana.ini +#RUN echo $'[dashbords.json] \n\ + # enabled = true \n\ + # path = /var/lib/grafana-dashboards-ceph' > /etc/grafana/grafana.ini USER grafana EXPOSE 3000 @@ -25,4 +25,5 @@ ENV GF_PATHS_PROVISIONING=/etc/grafana/provisioning ENV GF_AUTH_ANONYMOUS_ENABLED=true ENV GF_AUTH_ANONYMOUS_ORG_ROLE=Admin -ENTRYPOINT [ "/usr/bin/grafana", "server", "--config=/etc/grafana/grafana.ini", "--homepath=/usr/share/grafana", "--packaging=docker", "-configOverrides='cfg:default.paths.provisioning=/etc/grafana/provisioning cfg:default.paths.data=/var/lib/gra fana cfg:default.paths.logs=/var/log/grafana cfg:default.paths.plugins=/var/lib/grafana/plugins'" ] +ENTRYPOINT [ "/usr/bin/grafana" ] +CMD [ "server", "--config=/etc/grafana/grafana.ini", "--homepath=/usr/share/grafana", "--packaging=docker", "-configOverrides='cfg:default.paths.provisioning=/etc/grafana/provisioning cfg:default.paths.data=/var/lib/gra fana cfg:default.paths.logs=/var/log/grafana cfg:default.paths.plugins=/var/lib/grafana/plugins'" ]