From 9d629f2780818d7c1e689317a76d6e0e37d0589a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 7 Jan 2015 14:05:50 +0100 Subject: [PATCH] Tested with mysql, added simple fig file, need to write a more substantial fig setup --- Dockerfile | 45 --------------------------------- docker/fig.yml | 9 +++++++ pkg/stores/sqlstore/sqlstore.go | 3 +++ start_dependencies.sh | 9 ------- 4 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 Dockerfile create mode 100644 docker/fig.yml delete mode 100755 start_dependencies.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d2fdc855c24..00000000000 --- a/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu - -# Add the PostgreSQL PGP key to verify their Debian packages. -# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 - -# Add PostgreSQL's repository. It contains the most recent stable release -# of PostgreSQL, ``9.3``. -RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list - -# Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3 -# There are some warnings (in red) that show up during the build. You can hide -# them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3 - -# Note: The official Debian and Ubuntu images automatically ``apt-get clean`` -# after each ``apt-get`` - -# Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed`` -USER postgres - -# Create a PostgreSQL role named ``docker`` with ``docker`` as the password and -# then create a database `docker` owned by the ``docker`` role. -# Note: here we use ``&&\`` to run commands one after the other - the ``\`` -# allows the RUN command to span multiple lines. -RUN /etc/init.d/postgresql start &&\ - psql --command "CREATE USER grafana WITH SUPERUSER PASSWORD 'grafana';" &&\ - createdb -O grafana grafana - -# Adjust PostgreSQL configuration so that remote connections to the -# database are possible. -RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/9.3/main/pg_hba.conf - -# And add ``listen_addresses`` to ``/etc/postgresql/9.3/main/postgresql.conf`` -RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf - -# Expose the PostgreSQL port -EXPOSE 5432 - -# Add VOLUMEs to allow backup of config, logs and databases -VOLUME ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"] - -# Set the default command to run when starting the container -CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/var/lib/postgresql/9.3/main", "-c", "config_file=/etc/postgresql/9.3/main/postgresql.conf"] - diff --git a/docker/fig.yml b/docker/fig.yml new file mode 100644 index 00000000000..78246136dfb --- /dev/null +++ b/docker/fig.yml @@ -0,0 +1,9 @@ +db: + image: mysql:latest + ports: + - "3306:3306" + environment: + MYSQL_ROOT_PASSWORD: rootpass + MYSQL_DATABASE: grafana + MYSQL_USER: grafana + MYSQL_PASSWORD: password diff --git a/pkg/stores/sqlstore/sqlstore.go b/pkg/stores/sqlstore/sqlstore.go index 1dc27a79804..b6aefa34ee4 100644 --- a/pkg/stores/sqlstore/sqlstore.go +++ b/pkg/stores/sqlstore/sqlstore.go @@ -10,6 +10,7 @@ import ( m "github.com/torkelo/grafana-pro/pkg/models" "github.com/torkelo/grafana-pro/pkg/setting" + _ "github.com/go-sql-driver/mysql" "github.com/go-xorm/xorm" _ "github.com/mattn/go-sqlite3" ) @@ -112,6 +113,8 @@ func getEngine() (*xorm.Engine, error) { return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type) } + log.Info("Database: %v, ConnectionString: %v", DbCfg.Type, cnnstr) + return xorm.NewEngine(DbCfg.Type, cnnstr) } diff --git a/start_dependencies.sh b/start_dependencies.sh deleted file mode 100755 index 8c7a428845c..00000000000 --- a/start_dependencies.sh +++ /dev/null @@ -1,9 +0,0 @@ -docker build -t gf-pro-image . - -docker kill gf-pro -docker rm gf-pro - -docker run -d --name="gf-pro" \ - -p 127.0.0.1:5432:5432 \ - -v /var/docker/grafana-pro/postgresql:/var/lib/postgres \ - gf-pro-image