Commit Graph

97 Commits

Author SHA1 Message Date
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