Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

3 changed files with 10 additions and 56 deletions

View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: AGPL-3.0-only
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2024 SUSE LLC
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -13,23 +13,22 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# You can contact the BCI team via https://github.com/SUSE/bci/discussions
#!UseOBSRepositories
#!BuildTag: opensuse/grafana:%%grafana_patch_version%%-%RELEASE%
#!BuildTag: opensuse/grafana:%%grafana_patch_version%%
#!BuildTag: opensuse/grafana:%%grafana_patch_version%%-%RELEASE%
#!BuildTag: opensuse/grafana:%%grafana_minor_version%%
#!BuildTag: opensuse/grafana:%%grafana_minor_version%%-%RELEASE%
#!BuildTag: opensuse/grafana:%%grafana_major_version%%
#!BuildTag: opensuse/grafana:%%grafana_major_version%%-%RELEASE%
#!BuildTag: opensuse/grafana:latest
FROM opensuse/tumbleweed:latest
RUN set -euo pipefail; \
zypper -n install --no-recommends grafana; \
zypper -n clean; \
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
RUN set -euo pipefail; zypper -n in --no-recommends grafana; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.grafana
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed Grafana"
LABEL org.opencontainers.image.description="Grafana container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="%%grafana_patch_version%%"
@ -51,7 +50,7 @@ ENV GF_PATHS_PLUGINS="/var/lib/grafana/plugins"
ENV GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
ENTRYPOINT ["/run.sh"]
EXPOSE 3000/tcp
EXPOSE 3000
COPY run.sh /run.sh
RUN set -euo pipefail; chmod +x /run.sh

View File

@ -1,19 +1,19 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service mode="buildtime" name="replace_using_package_version">
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%grafana_major_version%%</param>
<param name="package">grafana</param>
<param name="parse-version">major</param>
</service>
<service mode="buildtime" name="replace_using_package_version">
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%grafana_minor_version%%</param>
<param name="package">grafana</param>
<param name="parse-version">minor</param>
</service>
<service mode="buildtime" name="replace_using_package_version">
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%grafana_patch_version%%</param>
<param name="package">grafana</param>

View File

@ -1,48 +1,3 @@
-------------------------------------------------------------------
Wed Jan 1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
- update copyright year
-------------------------------------------------------------------
Tue Dec 3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- Change attribute order in _service
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- be explicit in protocol for expose statement
-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
-------------------------------------------------------------------
Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
- make the tag with -%RELEASE% the first tag listed
-------------------------------------------------------------------
Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- rerender installation step in multiple lines, allow uninstalling optional packages
-------------------------------------------------------------------
Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- improved log cleaning
-------------------------------------------------------------------
Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- remove release tags for additional_versions
-------------------------------------------------------------------
Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
- set useobsrepositories explicitly
-------------------------------------------------------------------
Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <dmueller@suse.com>