From 00b31682752cc6c3c3470bfe574324ddf7f7bcdc Mon Sep 17 00:00:00 2001
From: infactum <infactum@gmail.com>
Date: Fri, 8 Feb 2019 18:08:59 +0500
Subject: [PATCH] CI update

---
 appveyor.yml                  | 2 +-
 buildenv/Dockerfile.centos7   | 6 +++++-
 buildenv/centos_entrypoint.sh | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 buildenv/centos_entrypoint.sh

diff --git a/appveyor.yml b/appveyor.yml
index 2b99921..177e64a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,7 +37,7 @@ build_script:
       mkdir build;
       docker run --rm -v "$(pwd)":/src "$docker_image" /bin/bash -c "
         mkdir build && cd build;
-        cmake -DCMAKE_BUILD_TYPE=Release /src;
+        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig && cmake -DCMAKE_BUILD_TYPE=Release /src
         cmake --build .;
         chmod +x tg2sip;
         chmod +x gen_db;
diff --git a/buildenv/Dockerfile.centos7 b/buildenv/Dockerfile.centos7
index 3502758..79e10e9 100644
--- a/buildenv/Dockerfile.centos7
+++ b/buildenv/Dockerfile.centos7
@@ -50,4 +50,8 @@ RUN source /opt/rh/devtoolset-7/enable \
     && cmake -DCMAKE_BUILD_TYPE=Release -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_TESTING=OFF .. \
     && cmake --build . --target install \
     && cd / \
-    && rm -rf spdlog
\ No newline at end of file
+    && rm -rf spdlog
+
+COPY centos_entrypoint.sh /
+
+ENTRYPOINT ["/centos_entrypoint.sh"]
\ No newline at end of file
diff --git a/buildenv/centos_entrypoint.sh b/buildenv/centos_entrypoint.sh
new file mode 100755
index 0000000..6a0bf18
--- /dev/null
+++ b/buildenv/centos_entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+source /opt/rh/devtoolset-7/enable
+
+exec "$@"
\ No newline at end of file