Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile description #103

Merged
merged 1 commit into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 4.1.0 (IN PROGRESS)

### Features / Enhancements

- Updated Dockerfile to separate categories (#101)
- Updated background and image (#102)
- Updated Dockerfile description (#103)

## 4.0.0 (2024-07-07)

### Features / Enhancements
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ ENV GF_AUTH_BASIC_ENABLED=false
## Disable Sanitize
ENV GF_PANELS_DISABLE_SANITIZE_HTML=true

# Updates Check
## Check for Updates
ENV GF_ANALYTICS_CHECK_FOR_UPDATES=false

## Scenes-engine Dashboards
#ENV GF_FEATURE_TOGGLES_ENABLE=dashboardScene

## Set Home Dashboard
ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/provisioning/dashboards/business.json

Expand Down Expand Up @@ -68,7 +71,7 @@ COPY img/background.svg /usr/share/grafana/public/img/g8_login_light.svg
RUN sed -i 's|<title>\[\[.AppTitle\]\]</title>|<title>Business Suite</title>|g' /usr/share/grafana/public/views/index.html
RUN sed -i 's|Loading Grafana|Loading Business Suite|g' /usr/share/grafana/public/views/index.html

## Update Help menu
## Update Mega and Help menu
RUN sed -i "s|\[\[.NavTree\]\],|nav,|g; \
s|window.grafanaBootData = {| \
let nav = [[.NavTree]]; \
Expand Down
13 changes: 0 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: '3.4'

services:
grafana:
container_name: grafana
build:
context: ./
dockerfile: Dockerfile
Expand All @@ -15,15 +14,3 @@ services:
volumes:
- ./dist:/var/lib/grafana/plugins/volkovlabs-app
- ./provisioning:/etc/grafana/provisioning

nginx:
container_name: nginx
build: ./nginx
restart: always
environment:
- GRAFANA_HOST=grafana
ports:
- 80:80/tcp
- 443:443/tcp
depends_on:
- grafana
Loading