From 3a6867b260b971e0e88b700280eb65cfea92782a Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Fri, 26 May 2017 18:17:36 +0200 Subject: [PATCH 1/3] fix glib include path; --- sqladvisor/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqladvisor/CMakeLists.txt b/sqladvisor/CMakeLists.txt index 3149044..d2024a4 100644 --- a/sqladvisor/CMakeLists.txt +++ b/sqladvisor/CMakeLists.txt @@ -4,7 +4,7 @@ project(sqladvisor) # /usr/local/sqlparser为sqlparser库安装目录,必要时进行修改 include_directories("/usr/local/sqlparser/include") include_directories("/usr/local/sqlparser/include/regex") -include_directories("/usr/lib64/glib-2.0/include") +include_directories("/usr/lib/x86_64-linux-gnu/glib-2.0/include") include_directories("/usr/include/glib-2.0") link_directories("/usr/local/sqlparser/lib") link_directories("/usr/lib64") From 60b1c2dc5834e657b10753f4e86a73420cad10eb Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Sat, 27 May 2017 11:39:52 +0200 Subject: [PATCH 2/3] add docker file; --- Dockerfile | 30 ++++++++++++++++++++++++++++++ Makefile | 3 +++ 2 files changed, 33 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ff98a0d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,30 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y \ + git \ + cmake libaio-dev libffi-dev libglib2.0-dev g++ \ + lsb-release \ + wget + +RUN wget https://repo.percona.com/apt/percona-release_0.1-4.$(lsb_release -sc)_all.deb + +RUN dpkg -i percona-release_0.1-4.$(lsb_release -sc)_all.deb + +RUN apt-get update && apt-get install -y libperconaserverclient18.1-dev + +WORKDIR /code + +COPY . /code + +RUN cmake -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr/local/sqlparser ./ +RUN make && make install + +WORKDIR /code/sqladvisor/ + +RUN cmake -DCMAKE_BUILD_TYPE=debug ./ +RUN make +RUN mv sqladvisor /usr/local/bin +RUN cd / \ + rm -rf /code + +CMD ['sqladvisor'] \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9d28ba3 --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ + +docker-build: + docker build . -t csimplestring/sqladviser \ No newline at end of file From 7fe00ae3654d4aa23a68faac8406a97fdbb2bd21 Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Sat, 27 May 2017 11:48:21 +0200 Subject: [PATCH 3/3] fix; --- Dockerfile | 5 +++-- Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff98a0d..dd38938 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ WORKDIR /code/sqladvisor/ RUN cmake -DCMAKE_BUILD_TYPE=debug ./ RUN make RUN mv sqladvisor /usr/local/bin -RUN cd / \ - rm -rf /code + +WORKDIR / +RUN rm -rf /code CMD ['sqladvisor'] \ No newline at end of file diff --git a/Makefile b/Makefile index 9d28ba3..64cb5d1 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,3 @@ docker-build: - docker build . -t csimplestring/sqladviser \ No newline at end of file + docker build . -t csimplestring/sqladvisor \ No newline at end of file