Commit Graph

156 Commits

Author SHA1 Message Date
Marcus Efraimsson
4d96bc590f
Docker: Upgrade packages to resolve reported vulnerabilities (#19188)
Fixes #19186
2019-09-18 19:32:14 +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
Leonard Gram
3481caf4fd Docs: changelog for docker 6.3 (#18429) 2019-08-07 11:12:57 +02:00
Sofia Papagiannaki
c9f7e3059f Fix failing end to end tests job for release (#18323)
Create and push the expected tag to grafana-dev repository
and use this instead for running the end to end tests
for the release.
2019-08-01 15:52:00 +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
gotjosh
f38187d68b
Minor 6.3.0 beta1 changes (#18048)
* chore: mirror the Dockerhub readme

Seems like the dockerhub readme is out of sync with this one. Let's update this one to make them identical.

* chore: add changes part of 6.3.0-beta1 to the docker image README

* chore: add the date to the 6.3.0-beta1 changes in the CHANGELOG
2019-07-17 17:24:09 +01:00
gotjosh
2fb45eeec8
Grafana-CLI: Wrapper for grafana-cli within RPM/DEB packages and config/homepath are now global flags (#17695)
* Feature: Introduce a grafana-cli wrapper

When our users install the *nix packed version of grafana, tendency is to use the services and scripts installed as part of the package for grafana-server. These leverage the default configuration options by specifying the several default paths.

This introduces a similar approach for the grafana-cli binary. We exposed it through a wrapper to ensure a proper configuration is in place. To enable that, we add the .real suffix to the original binary (grafana-cli.real) and then use a bash script named grafana-cli as the wrapper.

* Make the config and homepath flags global

* Introduce `configOverrides` as a global flag

This flag allows us to pass configuration overrides as a string.

The string follows the convention of configuration arguments separated by a space e.g. "cfg:default.paths.data=/dev/nullX cfg:default.paths.logs=/dev/nullX"

Also, it is backwards compatible with similar the previous configuration method through tailing arguments. Tailing arguments take presedence over the configuration options string.

* Only log configuration information in debug mode

* Move the grafana-cli binary to $GRAFANA_HOME/bin

As part of the package install process, we copy all the release files and
directories into the grafana home directory. This includes the /bin folder
from where we copied the binaries into their respective destinations.
After that, the /bin folder gets deleted as we don't want to keep
duplicates of the binaries around.

As part of this commit, we moved the re-creation of /bin within
grafana-home and the copy of the original binary (again) after the
folder gets deleted.
2019-06-24 20:20:21 +01:00
Carl Bergquist
f9b691bd54
Docker: Switch base to ubuntu:latest (#17066) 2019-06-14 22:57:55 +02: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
b8674f4ec1
rpm: start grafana after mysqld process (#16917)
closes #16850
2019-05-07 09:47:03 +02:00
Brian Gann
157f330cf2
area/circleci: Speed up circleci build process for branches and pr (#16778)
* speed up circleci build
* convert build.sh to functions and add args for different build types
* add yarn cache
* add build latest to packaging step
* fast build should not try to tag non-amd builds
* remove signing step for prs-and-branches
2019-05-01 10:20:01 -05:00
Dennis Hoppe
15383510c8 Use package libfontconfig1, instead of libfontconfig (#16548) 2019-04-15 08:20:42 +02:00
Oleg Gaidarenko
04b3afcd15
Chore: Implement revive (#16200)
Since we do not like some of the default golint rules,
this commit proposes to use https://github.com/mgechev/revive.

And potential revive speed-up should't hurt :).

Right now, presented config (./conf/revive.toml) is permissive,
we might improve it over time however. Fixes for found revive
issues in the code are very limited so it wouldn't be large to review.

Also in this commit:

* Add annotations for makefile commands and declare phony targets

* Rename "gometalinter" script and CI command to "lint"
  since we are doing there a bit more then using gometalinter package

* Add Makefile rules to .editorconfig

* Documentation which mentioned "golint" replaced with revive

Fixes #16109
Ref #16160
2019-03-27 17:53:49 +01:00
Torkel Ödegaard
a12960e476
Added comment to Docker file 2019-03-05 13:58:43 +01:00
Torkel Ödegaard
66d9b12981 Turn off verbose output from tar extraction when building docker files, fixes #15528 2019-03-05 12:03:48 +01:00
bergquist
5dc864b47f fixes invalid folder check
-f check if a file exists. -d checks if the dir exists
2019-02-11 11:36:34 +01:00
bergquist
7ce18ec4f7 extract notifiers folder creation to new if statement 2019-02-11 11:30:41 +01:00
bergquist
217eb6310e make sure notifiers dir exists for provisioning in docker 2019-02-11 11:17:23 +01:00
Marcus Efraimsson
9c18aa8684
make sure to create provisioning/notifiers directory for deb and rpm packages 2019-02-07 16:10:39 +01:00
Leonard Gram
caa9a90bfd build: removes arm32v6 docker image. 2019-01-22 11:44:02 +01:00
Leonard Gram
ec11d5a90a build: armv6 docker image. 2019-01-22 11:09:27 +01:00
Leonard Gram
c22ef628f3 build: removes curl install from build. 2019-01-10 15:12:43 +01:00
Leonard Gram
a82f0ed393 build: tags arm as well as amd64 as latest. 2019-01-10 14:41:02 +01:00
Johannes Würbach
702d449001 Docker image for ARM 2019-01-10 14:41:02 +01:00
Leonard Gram
13a962cc50 Revert "Docker image for ARM"
This reverts commit 5f7e6a5c73.
2019-01-09 16:25:07 +01:00
Leonard Gram
a237a495b0 Revert "build: fixes docker push."
This reverts commit be57f6878c.
2019-01-09 16:25:07 +01:00
Leonard Gram
be57f6878c build: fixes docker push. 2019-01-09 15:52:04 +01:00
Johannes Würbach
5f7e6a5c73 Docker image for ARM 2019-01-09 15:09:13 +01:00
Torkel Ödegaard
dc22beadca wip: style change progress 2018-12-13 16:02:14 +01:00
Torkel Ödegaard
b380f74131 updated publish script 2018-12-10 16:39:54 +01:00
Leonard Gram
9a771555f3 build: update latest when pushing docker. 2018-12-04 11:16:49 +01:00
Leonard Gram
bccce9922a docker: Upgrades base packages in the images.
Related to #14182
2018-11-26 16:41:46 +01:00
Leonard Gram
6c267cb592 build: docker build for ge. 2018-11-21 09:03:05 +01:00
Leonard Gram
438f7d0332 build: refactoring. 2018-11-16 09:03:46 +01:00
Leonard Gram
2e8c4699b0 build: internal metrics for packaging. 2018-11-15 14:42:09 +01:00
Leonard Gram
5c1615292a build: grafana enterprise docker image. 2018-10-31 16:02:36 +01:00
bergquist
0e34a6be0f removes old invalid release guide
closes #13864
2018-10-29 10:37:30 +01:00
Leonard Gram
e2f74b55d2
build: grafana enterprise docker. (#13839) 2018-10-26 14:23:30 +02:00
Leonard Gram
4cc89f1753
docker: adds curl back into the docker image for utility. (#13794) 2018-10-23 16:10:23 +02:00
Leonard Gram
cc50cfd9d3 build: beta versions no longer tagged as latest.
Closes #12862
2018-08-16 14:03:49 +02:00
Leonard Gram
d7a0f5ee07
Removes link to deprecated docker image build 2018-08-13 11:14:24 +02:00
Leonard Gram
48713b76f3 docker: makes it possible to set a specific plugin url.
Originally from the grafana/grafana-docker repo, authored
by @ClementGautier.
2018-08-13 09:17:44 +02:00
Leonard Gram
d48f1f57f0 build: fixes png rendering in the docker based docker-image build. 2018-08-09 09:10:53 +02:00
Leonard Gram
a73fc4a688
Smaller docker image (#12824)
* build: makes the grafana docker image smaller.

* build: branches and PR:s builds the docker image.
2018-08-06 17:34:25 +02:00
Leonard Gram
0d9870d9f1 build: failing to push to docker hub fails the build. 2018-08-06 16:26:59 +02:00
Leonard Gram
0ff54d257a build: makes it easier to build a local docker container. 2018-08-03 09:40:02 +02:00
Leonard Gram
99a9dbb04f build: complete docker build for master and releases. 2018-08-02 19:24:05 +02:00
Leonard Gram
424aa6e564 build: removes unused args to docker build. 2018-08-02 19:24:05 +02:00
Leonard Gram
580e2c36d1 build: imported latest changes from grafana-docker. 2018-08-02 19:24:05 +02:00
Leonard Gram
e3a907214d build: builds docker image from local grafna tgz. 2018-08-02 19:24:05 +02:00