Commit Graph

151 Commits

Author SHA1 Message Date
Jack Westbrook
2281abaf37
Revert: Babel removal and runtime update (#63641)
* Revert "Update babel monorepo to v7.21.0 (#63532)"

This reverts commit 3d974fc716.

* Revert "Chore: Remove babel deps and config (#62461)"

This reverts commit 21a988a659.
2023-02-23 09:22:35 -05:00
Jack Westbrook
21a988a659
Chore: Remove babel deps and config (#62461)
* chore: remove unused frontend build deps babel and ts-loader

* chore(babel): delete redundant config file and remove ref in pr-commands

* chore: clean up references to babel.config.js
2023-02-23 11:59:05 +01:00
Emil Tullstedt
c72d18f5e6
Revert "Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63506)" (#63567)
This reverts commit 747ddf7b33.
2023-02-22 08:14:26 -05:00
Emil Tullstedt
747ddf7b33
Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63506) 2023-02-22 11:53:06 +01:00
Sofia Papagiannaki
29d3e696f0
Swagger: Fix circular reference (#62673)
* Swagger: Fix circular reference

* gitignore intermediate swagger file

* Update specs

* Do not generate specs when building the backend
2023-02-02 13:18:04 +02:00
Ashley Harrison
64352e8d08
Chore: Move to node 18 again (#62079)
move to node 18 again
2023-01-26 10:19:39 +00:00
Dan Cech
0c8a2bbfd5
copy .github folder into golang build container since we rely on codeowners (#62122)
* copy .github folder into golang build container since we rely on codeowners

* remove .github for .dockerignore
2023-01-25 10:31:16 -05:00
Emil Tullstedt
67661c2535
Fix: Use an existing Dockerfile for the Go image (#61158) 2023-01-10 17:11:43 +01:00
Emil Tullstedt
bf574e98c8
Chore: Upgrade Go to 1.19.4 (#60794) 2022-12-29 13:03:56 +01:00
Dan Cech
7436872dab
Build: Unified dockerfile for all builds (#59173)
* unified dockerfile for all builds

* update builder

* include docker commands and output in logs

* quiet docker build

* quiet gsutil
2022-11-28 16:18:53 -05:00
Dan Cech
9fec54df2d
Build: Streamline and sync dockerfiles (#58101)
* streamline and sync dockerfiles

* improve go dependency cacheability

* unify alpine and ubuntu Dockerfiles

* include glibc support in locally-built alpine images
2022-11-28 14:43:42 -05:00
Dan Cech
de99ce139c
Server: Switch from separate server & cli to a unified grafana binary (#58286)
* avoid the need for a second bulky binary for grafana-cli

* look for grafana-server in $PATH as well as same directory

* implement unified "grafana" command

* update dockerfiles, fix grafana-cli -v

* update packaging to work with single binary

- add wrapper scripts for grafana and grafana-server
- update and sync package files
- implement --sign flag of build package command
- stop packaging scripts folder, they are not useful for end users
- add support for --configOverrides in server command
- remove unused nfpm.yaml config file

* windows support
2022-11-22 11:53:43 -05:00
Ashley Harrison
ff1afbb699
Revert "Chore: move to node 18 (#58570)" (#58754)
This reverts commit 0a9129cf90.
2022-11-15 13:47:14 +00:00
Ashley Harrison
0a9129cf90
Chore: move to node 18 (#58570)
* bump node version to 18

* update folder to 18.x

* update README for m1 instructions

* update drone

* update unit test

* update README
2022-11-11 11:34:00 +00:00
Emil Tullstedt
428dd54094
Chore: Upgrade Go to 1.19.3 (#58052) 2022-11-04 14:50:43 +01:00
Dan Cech
6a4a10fa92
remove unneeded package updates (#58005) 2022-11-02 09:30:20 -04:00
Emil Tullstedt
c2d3a31772
Chore: Upgrade Go to 1.19.2 (#56355) 2022-10-07 12:47:24 +02:00
Emil Tullstedt
b287047052
Chore: Upgrade Go to 1.19.1 (#54902)
* WIP

* Set public_suffix to a pre Ruby 2.6 version

* we don't need to install python

* Stretch->Buster

* Bump versions in lib.star

* Manually update linter

Sort of messy, but the .mod-file need to contain all dependencies that
use 1.16+ features, otherwise they're assumed to be compiled with
-lang=go1.16 and cannot access generics et al.

Bingo doesn't seem to understand that, but it's possible to manually
update things to get Bingo happy.

* undo reformatting

* Various lint improvements

* More from the linter

* goimports -w ./pkg/

* Disable gocritic

* Add/modify linter exceptions

* lint + flatten nested list

Go 1.19 doesn't support nested lists, and there wasn't an obvious workaround.
https://go.dev/doc/comment#lists
2022-09-12 12:03:49 +02:00
malcolmholmes
a19d82124b
Build: upgrade Alpine images (#53743) 2022-08-15 18:17:55 +02:00
Jean-Philippe Quéméner
8c5f5e7a32
Alerting: create provisioning dir in docker image (#53594) 2022-08-12 00:16:02 +02:00
Holger Freyther
27709adac3
docker: The cue directory is gone. Catch-up (#52606)
The files got removed in 8876d56495 but
the container was not updated yet.
2022-07-29 10:47:27 -05:00
Emil Tullstedt
78f26a079c
Chore: Upgrade to Go version 1.17.12 (#52523) 2022-07-20 14:27:44 +02:00
Dimitris Sotirakis
7b750cc0f0
Update Golang - bump grabpl and build-container (#50253) 2022-06-06 15:38:39 +02:00
Emil Tullstedt
24038d9985
Chore: Update Go version (#47914)
* Remove makefile (it's not used anymore)

* Directly download and install nodejs package

The Packages file for deb.nodesource.com/node_16.x doesn't list older
versions, so only the most recent version of nodejs is available. We
don't want to require every update to the build container to have to
update nodejs if a never version is available, so I manually download
the deb and install it with dpkg.

* Update Go version

* Update lib.star

* Generate new .drone.yml
2022-04-20 09:14:12 +02:00
Dimitris Sotirakis
a29159f362
Update golang (#46458) 2022-03-11 16:09:17 +01:00
ying-jeanne
b512a3d75f
bump go version to 1.17.7 (#45772) 2022-02-23 15:30:48 +02:00
Sofia Papagiannaki
35fe58de37
API: Extract OpenAPI specification from source code using go-swagger (#40528)
* API: Using go-swagger for extracting OpenAPI specification from source code

* Merge Grafana Alerting spec

* Include enterprise endpoints (if enabled)

* Serve SwaggerUI under feature flag

* Fix building dev docker images

* Configure swaggerUI

* Add missing json tags

Co-authored-by: Ying WANG <ying.wang@grafana.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-02-08 13:38:43 +01:00
idafurjes
3ca58c0e0c
Chore: Upgrade go and alpine (#43801)
* Upgrade go and alpine

* Bump grabpl version

* Bump alpine version

* Fix version of grabpl

* Bump alpine version

* Bump alpine in Dockerfiles
2022-01-07 17:27:22 +01:00
Marcus Efraimsson
d71cd65dbc
Chore: Update developer guide with instructions building from Windows (#42390)
In addition, removess copying of local directory in Dockerfile since that directory 
normally doesn't exist.
2021-12-01 10:34:00 +01:00
Jean-Philippe Quéméner
f3b023ffa6
Fix: add the babel config to the dockerfiles (#42021) 2021-11-20 15:40:13 +01:00
Dave Henderson
fc7277920c
Dockerfile: Bump Go and Alpine versions (#41922)
* Dockerifle: Bump Go and Alpine versions

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>

* Updating .drone.yml with 'make drone'

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
2021-11-19 18:59:24 +01:00
Guilherme Caulada
aac3f88603
Fix binaries copy step on dockerfile (#41281) 2021-11-04 12:35:32 -03:00
Guilherme Caulada
3cefa0bbba
Add support for local Makefile to docker (#41296) 2021-11-04 11:13:10 -03:00
Kevin Minehart
4c969081bc
fix the root Dockerfile and add additional .dockerignore rules (#41006)
* fix the root Dockerfile and add additional .dockerignore rules

* Update go.mod/go.sum and ubuntu dockerfile
2021-10-28 09:41:10 -05:00
Chunlin Yang
54899f91ff
Chore: Update Dockerfile to make it work (#40672) 2021-10-26 11:08:31 +01:00
Kevin Minehart
9c2d70ce0f
Packaging: Dependency updates (#40534)
* update loki

* install openssl from alpine's edge repository

* extracttraceid moved to tracing package

* remove exit if warning limit is exceeded

* disable flaky libraryelements test
2021-10-18 19:50:10 +02:00
Dimitris Sotirakis
78b3847014
Copy cue.mod and packages/grafana-schema to container workdir (#38998) 2021-09-09 08:54:36 +03:00
Dimitris Sotirakis
a5ce61b539
Chore: Update to alpine:3.14.2 (#38813)
* Update apline to 3.14.2

* Remove libcrypto1.1 libssl1.1 version dependencies

* Update grabpl version
2021-09-02 12:57:11 +03:00
blackmetal23
fe65021c14
Update Dockerfile (#38785)
Update alpine 3.14.1 to 3.14.2
CVE : https://github.com/alpinelinux/docker-alpine/issues/199
2021-09-02 11:45:33 +03:00
Dimitris Sotirakis
8e2ee0a1c8
Chore: Update to Golang 1.17 (#38608)
* Update to golang 1.17

* Further updates

* Run go mod tidy on go 1.17

* Apply suggestions from code review

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Use build-container:1.4.2

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-08-31 09:19:26 +03:00
Dimitris Sotirakis
00886afaf1
Force use versions of libcrypto1.1 and libssl1.1 (#38585) 2021-08-26 15:22:53 +02:00
Dimitris Sotirakis
da72dc55cb
Update to golang:1.16.1-alpine3.14 (#38508) 2021-08-24 16:13:12 +02:00
Kevin Minehart
b3c4b20953
Docker: Update base alpine version (fix CVE-2021-36159) (#38088)
* update base alpine version and update apk packages in Dockerfile

* update base alpine version

* don't need to apk update

* remove space

* Update to alpine 3.14.1

Co-authored-by: Malcolm Holmes <mdh@odoko.co.uk>
2021-08-20 12:54:03 +01:00
Will Browne
56702376b6
delay go mod verify until all is copied (#37246) 2021-07-27 11:50:25 +02:00
Gabriel MABILLE
d56a653e73
AccessControl: Add provisioning folder to the packaging process (#34398)
* AccessControl: Add provisioning folder to the packaging process
2021-05-20 09:41:39 +02:00
Serge Zaitsev
675922b574
Fix dockerfiles to use embed.go and Go 1.16 (#33643) 2021-05-04 09:43:12 +02:00
Dimitris Sotirakis
3a841ebe00
Downgrade to node:14.16.0-alpine3.13 (#32065) 2021-03-17 17:07:39 +02:00
Dimitris Sotirakis
f917c2ab0f
Bug: Update react-use-measure dependency to fix docker-build-full f… (#31802)
* Bug: Update `react-use-measure` dependency to fix docker-build-full failure

* Add #remove-cjs-export to point to the correct branch

* Add git package - update js-builder version
2021-03-12 12:28:54 +02:00
Dimitris Sotirakis
d59574ec1e
Update scripts and Dockerfiles to use Go 1.16.1 (#31881)
* Update scripts and Dockerfiles to use Go 1.16.1

* Update build-container image version to 1.4.1

* Update node version to 14.16.0-1nodesource1

* Updated drone configuration
2021-03-11 12:55:04 +02:00
Arve Knudsen
357cd8eb81
CI: Upgrade Dockerfiles wrt. Go, Node, Debian (#31407)
* CI: Upgrade Dockerfiles wrt. Go 1.16, Node, Debian

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-02-24 08:52:48 +01:00
VishalLahane
ee405ef069
Make build docker full fix (#29570)
* [#29569]: Added creation of missing directory 

For image [ubuntu] : /etc/grafana/provisioning/plugins was missing in image creation.

* [#29569]: Added creation of missing directory 

For image [alpine] : /etc/grafana/provisioning/plugins was missing in image creation.
2020-12-03 14:17:40 +01:00
Torkel Ödegaard
00d59ec1fc
NodeJS: Update to LTS (14) (#29467)
* NodeJS: Update to LTS (14)

* Bump Volta's Node version

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Bump version of build image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Upgrade build image

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-12-02 18:18:49 +01:00
Brett Snyder
2d49d3f5b2
docker: use yarn to build (#29538) 2020-12-02 15:49:48 +01:00
Brett Snyder
d953a56eb6
docker: fix Dockerfile after Gruntfile.js removed (#29515) 2020-12-02 09:15:53 +01:00
Leonard Gram
b44a41aab3
Docker: update docker root group docs and docker image (#29222)
* Docs: updates changelog and docs for openshift docker fix

* Docker: local docker build synced with official build

* Update docs/sources/installation/docker.md

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update docs/sources/installation/upgrading.md

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update CHANGELOG.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update CHANGELOG.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/installation/upgrading.md

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2020-11-23 12:29:53 +01:00
Arve Knudsen
a5c03b1772
Chore: Upgrade Node to 12.19.0 (#28168)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-10-12 07:10:50 +02:00
Arve Knudsen
19c8097595
Chore: Upgrade to Go 1.15.1 (#27326)
* Chore: Upgrade to Go 1.15.1
2020-09-02 15:51:19 +02:00
Arve Knudsen
61041912d5
CI: Upgrade Go and Node versions in CI build image (#26888)
* Upgrade Go and Node versions in CI build image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Upgrade Dockerfile to Go 1.14.7 and Node 12.18.3

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Upgrade Dockerfile.ubuntu to Go 1.14.7 and Node 12.18.3

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-08-10 10:45:35 +02:00
Artem Kuchumov
2ba0083784
Docker: Don't upgrade packages when installing (#24132) (#26055) 2020-07-28 17:07:23 +02:00
Arve Knudsen
463e8ffd92
Docker: Upgrade to base on Alpine 3.12 (#25936)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-06-30 14:26:02 +02:00
Arve Knudsen
6fb7a60a2b
Dockerfile: Move Go step after JS step, since it's faster (#24221)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-05-04 11:59:10 +02:00
Arve Knudsen
dda8caf48c
Docker: Upgrade to Alpine 3.11 (#24056)
* Docker: Upgrade to Alpine 3.11
2020-04-30 13:42:06 +02:00
Arve Knudsen
295e15246e
Fix Dockerfile* (#23954)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-27 18:13:27 +02:00
Arve Knudsen
49a90cd764
Dockerfile: Copy in the tools directory, to fix build (#23773)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-22 11:11:19 +02:00
Torkel Ödegaard
5bf43af5ae
Docker: Fix root docker file build (#23772)
Fixes #23754
2020-04-22 10:18:36 +02:00
Marcus Efraimsson
6e313e7d37
Image Rendering: Remove PhantomJS support (#23460)
Removes all references and usage of PhantomJS #23375.
Remove direct link rendered image e2e smoke test for now.
Docker: Fix installing chrome in ubuntu custom docker image.
Improve handling of image renderer not available/installed #23593.
Add PhantomJS breaking change and upgrading notes.
Use grabpl v0.2.10.

Closes #13802

Co-authored-by: Kyle Brandt <kyle@grafana.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
2020-04-15 22:17:41 +02:00
Arve Knudsen
7799dd84c1
Chore: Upgrade to Go 1.14 (#23371)
* Chore: Upgrade to Go 1.14
* Chore: Bump version of grafana/grafana-ci-deploy Docker image
* Chore: Fix/bump version of grafana/build-container Docker image
* CircleCI: Upgrade build Docker images
2020-04-08 14:13:05 +02:00
Steven Vachon
0f06200a9d
Fix Dockerfile lint errors (#22496) 2020-02-28 16:27:49 +01:00
Steven Vachon
f48169633c
TSLint → ESLint (#21006)
* Alphabetized tslint and tsconfig files

* Optimized tsconfig files

* Optimized editorconfig & prettier config files

… to reduce redundancy

* Switched to @grafana/tsconfig

… and:
* de-duped options
* removed options with default values

* Fixed nasty issue with types for nested slate-react

* Replaced TSLint with ESLint

* TSLint disables → ESLint disables

… also JSHint removals, which haven’t had an affect since it was replaced with TSLint.

* Compliances for ESLint, Prettier and TypeScript

* Updated lockfile
2020-02-08 02:40:04 +01:00
Lukas Siatka
0a080beffa
DevEnv: updates nodejs from 10.x to 12.x and golang to 1.13 in ci-deploy dockerfile. (#20405)
* DevEnv: updates nodejs to 12.x and golang to 1.13

* Updates CI-build and CI-deploy image versions

* DevEnv: updates update repo readme

* DevEnv: updates build container version
2019-11-21 15:16:32 +01:00
Shubham Bhattar
4424c2f43f Docker: Reduce layers in build container and modified initialization of PATH env in final container (#20132)
Multiple local files copied to same destination in one COPY instruction in 0th build container. PATH env variable is modified using the default PATH env variable available in alpine container to achieve the same effect.
2019-11-04 10:55:40 -08:00
Leonard Gram
e940edc79f
Docker: makes it possible to parse timezones in the docker image (#20081) 2019-10-30 09:33:27 +01:00
Arve Knudsen
d8b6a873d8
Chore: Upgrade Docker images to Go 1.13.1 (#19576)
* Chore: Upgrade Docker image/CI to Go 1.13.1

Fixes #18878

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Use golangci-lint master revision
2019-10-08 08:32:18 +02:00
Marcus Efraimsson
d65a3318ab
Build: Upgrade go to 1.12.10 (#19499)
Fixes #19451
2019-09-30 15:41:25 +02:00
Marcus Efraimsson
4d96bc590f
Docker: Upgrade packages to resolve reported vulnerabilities (#19188)
Fixes #19186
2019-09-18 19:32:14 +02:00
Franz Schwartau
0167e0a6b2 Dev Docker: Use golang:1.12.9-alpine to prevent glibc mismatch. (#18701)
Using golang:1.12.9 which is based on Debian as a build container
leads to a version mismatch for glibc when running grafana-server
in alpine:3.10

grafana-server: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by grafana-server)
2019-08-25 16:20:52 +02:00
Marcus Olsson
299a0e20f4
Build: Upgrade to go 1.12.9 (#18638)
* Build: Upgrade to go 1.12.9

* Build: Use default-mysql-client for debian buster

The go base image has been updated to use Debian Buster instead of
Stretch, which seems to have done away with mysql-client in favor of
default-mysql-client.

* Build: Update Dockerfile to use go 1.12.9

Fixes #18592
2019-08-20 12:29:42 +02:00
Dan Cech
302a1f06bc Docker: switch docker image to alpine base with phantomjs support (#18468)
* switch docker image to alpine base

* Docker: switch packaging image to alpine

* use alpine image for build containers

* switch base images in build script

* only try to set up phantomjs on x86_64, reduce number of layers

* phantomjs binary is bundled with grafana
2019-08-16 17:46:35 +02:00
Hassan Farid
711f62c813 Replaced ubuntu:latest with ubuntu:18.04; specific image version to make grafana build images consistent (#18224) 2019-07-23 18:33:37 +02:00
johannes
15ce5a68cf Build: copy .browserslistrc to node build container (#18141) 2019-07-16 16:57:31 +02:00
Carl Bergquist
f9b691bd54
Docker: Switch base to ubuntu:latest (#17066) 2019-06-14 22:57:55 +02:00
Oleg Gaidarenko
db95414d02
Feature: provide multildap server configuration (#16914)
* Feature: provide multildap server configuration

* Add multildap server configuration for devenv

* Change some of the notes for openldap devenv configuration

* Change the maintainer label for *main* dockerfile and of the devenv one

Re-checked the multildap logic - everything seems to be working fine
2019-05-13 11:51:16 +03:00
Will Medlar
5e44f001fb Docker: Prevent a permission denied error when writing files to the default provisioning directory (#16831)
* build: Grant ownership of provisioning directory to runtime user
2019-05-10 09:03:17 +02:00
Carl Bergquist
fef3638018
build: removes gopkg files from dev docker file (#16817) 2019-04-30 12:01:43 +02:00
Carl Bergquist
9134251417
build: upgrades to golang 1.12.4 (#16545)
fix govet issue in golang 1.12.4
2019-04-15 09:18:28 +02:00
Dennis Hoppe
15383510c8 Use package libfontconfig1, instead of libfontconfig (#16548) 2019-04-15 08:20:42 +02:00
Carl Bergquist
30dcf0f6c5
Revert "Build: Upgrades to go 1.12.3 (#16491)" (#16544)
This reverts commit 44b365028f.
2019-04-12 11:17:31 +02:00
Carl Bergquist
44b365028f
Build: Upgrades to go 1.12.3 (#16491)
fixes go vet issue that 1.12.3 detects
2019-04-12 09:44:02 +02:00
bergquist
217eb6310e make sure notifiers dir exists for provisioning in docker 2019-02-11 11:17:23 +01:00
bergquist
d75f53e895 upgrade golang to 1.11.5 2019-01-28 08:08:29 +01:00
Leonard Gram
674ab73806 build: fixes building grafana completely within docker.
Fixes #15060
2019-01-25 10:52:47 +01:00
bergquist
17f8be90ae upgrade to golang 1.11.4 2018-12-17 14:25:47 +01:00
Leonard Gram
bccce9922a docker: Upgrades base packages in the images.
Related to #14182
2018-11-26 16:41:46 +01:00
bergquist
fda9790ba5 upgrades to golang 1.11 2018-08-25 21:23:20 +02:00
Leonard Gram
d48f1f57f0 build: fixes png rendering in the docker based docker-image build. 2018-08-09 09:10:53 +02:00
Dan Cech
c025490518 move run script, update README 2018-08-09 09:10:53 +02:00
Dan Cech
96d6657b00 produce an image compatible with grafana-docker 2018-08-09 09:10:53 +02:00
Lorenz Brun
c89f21ba29 More efficient builds and some fixes to the Go binaries 2018-08-09 09:10:53 +02:00
Lorenz Brun
a5d1fb7e56 Simple Docker-based build option
This Dockerfile allows anyone with a recent version of Docker to quickly build a fully working Grafana container without any local build tooling. Pulling the sources from Git and calling `docker build .` is enough.
2018-08-09 09:10:53 +02:00
Daniel Lee
400bd205a8
Removing file that got committed by accident 2017-11-22 09:30:49 +01:00