Skip to content

Commit 7061ef5

Browse files
tiredofittiredofit
committed
1.1.0pre
1 parent 7843c6a commit 7061ef5

File tree

19 files changed

+369
-237
lines changed

19 files changed

+369
-237
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
examples/

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ assignees: ''
2929
### Environment
3030
<!--Your Configuration (please complete the following information): -->
3131

32-
- Image version / tag:
32+
- Image version / tag:
3333
- Host OS:
3434

3535
<details>
36-
<summary>Any logs | docker-compose.yml</summary>
36+
<summary>Any logs | compose.yml</summary>
3737
</details>
3838

3939
<!-- Include anything additional -->
40-
40+
4141
### Possible fixes
4242
<!-- If you can, provide details to the root cause that might be responsible for the problem. -->

‎.github/dependabot.yml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/workflows/main.yml‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,36 @@
1-
name: "build_image"
2-
31
on:
42
push:
53
paths:
6-
- "**"
7-
- "!README.md"
8-
4+
- '**'
5+
- '!CHANGELOG.md'
6+
- '!/examples/*'
7+
- '!LICENSE'
8+
- '!README.md'
9+
- '!/zabbix_templates/*'
910
jobs:
11+
prepare:
12+
uses: nfrastack/gha/.github/workflows/artifacts-encrypt.yml@main
13+
secrets: inherit
1014
build:
11-
uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
12-
#uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
13-
#uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
14-
#uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
15+
needs: prepare
16+
strategy:
17+
matrix:
18+
include:
19+
- { distro: "alpine", distro_variant: "3.22", latest: "true", arch: "linux/amd64,linux/arm64" }
20+
uses: nfrastack/gha/.github/workflows/container-build_generic.yml@main
21+
with:
22+
base_image: "ghcr.io/nfrastack/container-nginx"
23+
tag: ${{ matrix.tag || '' }}
24+
distro: ${{ matrix.distro }}
25+
distro_variant: ${{ matrix.distro_variant }}
26+
image_variant: ${{ matrix.image_variant || '' }}
27+
latest: ${{ matrix.latest }}
28+
distro_latest: ${{ matrix.distro_latest }}
29+
platforms: ${{ matrix.arch }}
30+
push_dockerhub: ${{ matrix.push_dockerhub || true }}
31+
push_ghcr: ${{ matrix.push_ghcr || true }}
32+
secrets: inherit
33+
cleanup:
34+
needs: [ build ]
35+
uses: nfrastack/gha/.github/workflows/artifacts-remove.yml@main
1536
secrets: inherit

‎.github/workflows/manual.yml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/build-assets/*
2+
!/build-assets/.empty
3+

‎CHANGELOG.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
## 1.0.99 2025-11-10 <dave at tiredofit dot ca>
1+
## 1.1.0pre 2025-08-13 <code at nfrastack dot com>
2+
3+
### Changed
4+
- Changed base image
5+
- Grafana 12.2.1
6+
7+
## 1.0.99 025-11-10 <dave at tiredofit dot ca>
28

39
Add EOL notice and deprecate image
410

@@ -259,9 +265,9 @@ Add EOL notice and deprecate image
259265
### Added
260266
- Grafana 10.2.1
261267
- Customizable Database engine
262-
268+
263269
### Changed
264-
- Fixed some deprecated configs
270+
- Fixed some deprecated configs
265271

266272
## 0.0.83 2023-11-14 <dave at tiredofit dot ca>
267273

‎Containerfile‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# SPDX-FileCopyrightText: © 2025 Nfrastack <code@nfrastack.com>
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
ARG \
6+
BASE_IMAGE
7+
8+
FROM ${BASE_IMAGE}
9+
10+
LABEL \
11+
org.opencontainers.image.title="Grafana" \
12+
org.opencontainers.image.description="Analytics and monitoring platform" \
13+
org.opencontainers.image.url="https://hub.docker.com/r/nfrastack/grafana" \
14+
org.opencontainers.image.documentation="https://github.com/nfrastack/container-grafana/blob/main/README.md" \
15+
org.opencontainers.image.source="https://github.com/nfrastack/container-grafana.git" \
16+
org.opencontainers.image.authors="Nfrastack <code@nfrastack.com>" \
17+
org.opencontainers.image.vendor="Nfrastack <https://www.nfrastack.com>" \
18+
org.opencontainers.image.licenses="MIT"
19+
20+
ARG \
21+
GRAFANA_VERSION="v12.2.1" \
22+
GRAFANA_REPO_URL="https://github.com/grafana/grafana"
23+
24+
COPY CHANGELOG.md /usr/src/container/CHANGELOG.md
25+
COPY LICENSE /usr/src/container/LICENSE
26+
COPY README.md /usr/src/container/README.md
27+
28+
ENV \
29+
NGINX_ENABLE_CREATE_SAMPLE_HTML=FALSE \
30+
NGINX_SITE_ENABLED=grafana \
31+
IMAGE_NAME="nfrastack/grafana" \
32+
IMAGE_REPO_URL="https://github.com/nfrastack/container-grafana/"
33+
34+
EXPOSE 3000
35+
36+
RUN echo "" && \
37+
GRAFANA_BUILD_DEPS_ALPINE=" \
38+
gcc \
39+
make \
40+
musl-dev \
41+
nodejs \
42+
npm \
43+
yarn \
44+
" \
45+
&& \
46+
GRAFANA_RUN_DEPS_ALPINE=" \
47+
chromium \
48+
libc6-compat \
49+
ttf-opensans \
50+
udev \
51+
" \
52+
&& \
53+
\
54+
source /container/base/functions/container/build && \
55+
container_build_log image && \
56+
create_user grafana 472 grafana 472 /usr/share/grafana && \
57+
package update && \
58+
package upgrade && \
59+
package install \
60+
GRAFANA_BUILD_DEPS \
61+
GRAFANA_RUN_DEPS \
62+
&& \
63+
package build go && \
64+
\
65+
clone_git_repo "${GRAFANA_REPO_URL}" "${GRAFANA_VERSION}" /usr/src/grafana && \
66+
make && \
67+
cp -aR \
68+
/usr/src/grafana/bin/linux-$(container_info arch alt)/grafana \
69+
/usr/src/grafana/bin/linux-$(container_info arch alt)/grafana-cli \
70+
/usr/src/grafana/bin/linux-$(container_info arch alt)/grafana-server \
71+
/usr/local/sbin && \
72+
mkdir -p /usr/share/grafana && \
73+
cp -aR \
74+
/usr/src/grafana/conf \
75+
/usr/src/grafana/public \
76+
/usr/share/grafana && \
77+
chown -R grafana:grafana /usr/share/grafana && \
78+
container_build_log add "Grafana" "${GRAFANA_VERSION}" "${GRAFANA_REPO_URL}" && \
79+
package remove \
80+
GRAFANA_BUILD_DEPS && \
81+
package cleanup
82+
83+
COPY rootfs /

‎Dockerfile‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Dave Conroy
3+
Copyright (c) 2025 Nfrastack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)