IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Devenv: update mysql_tests and postgres_tests blocks for allowing dynamically change of underlying docker image (#29525)

Browse Source 
* Devenv: allow dynamically change mysql_tests docker image

* Devenv: allow dynamically change postgres_tests docker image
This commit is contained in:
Sofia Papagiannaki 2020-12-02 11:06:53 +02:00 committed by GitHub
parent 73518bf1e7
commit 6c4f6211cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devenv/docker/blocks/mysql_tests/.env Normal file
View File

@ -0,0 +1 @@
mysql_version=5.6

3
devenv/docker/blocks/mysql_tests/Dockerfile
View File

@ -1,3 +1,4 @@
FROM mysql:5.6 ARG mysql_version=5.6
FROM mysql:${mysql_version}
ADD setup.sql /docker-entrypoint-initdb.d ADD setup.sql /docker-entrypoint-initdb.d
CMD ["mysqld"] CMD ["mysqld"]

2
devenv/docker/blocks/mysql_tests/docker-compose.yaml
View File

@ -1,6 +1,8 @@
mysqltests: mysqltests:
build: build:
context: docker/blocks/mysql_tests context: docker/blocks/mysql_tests
args:
- mysql_version=${mysql_version}
environment: environment:
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests

1
devenv/docker/blocks/postgres_tests/.env Normal file
View File

@ -0,0 +1 @@
postgres_version=9.3

3
devenv/docker/blocks/postgres_tests/Dockerfile
View File

@ -1,3 +1,4 @@
FROM postgres:9.3 ARG postgres_version=9.3
FROM postgres:${postgres_version}
ADD setup.sql /docker-entrypoint-initdb.d ADD setup.sql /docker-entrypoint-initdb.d
CMD ["postgres"] CMD ["postgres"]

2
devenv/docker/blocks/postgres_tests/docker-compose.yaml
View File

@ -1,6 +1,8 @@
postgrestest: postgrestest:
build: build:
context: docker/blocks/postgres_tests context: docker/blocks/postgres_tests
args:
- postgres_version=${postgres_version}
environment: environment:
POSTGRES_USER: grafanatest POSTGRES_USER: grafanatest
POSTGRES_PASSWORD: grafanatest POSTGRES_PASSWORD: grafanatest