postgis: fix mysql-odbc for postgis 2.5

merkatorgis · Aug 18, 2022 · 9ffe3de · 9ffe3de
1 parent 2c45878
commit 9ffe3de
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/base/postgis/Dockerfile b/base/postgis/Dockerfile
@@ -47,11 +47,11 @@ ENV MYSQL_VERSION=${MYSQL_VERSION}
 COPY conf/src/mysql-apt-config_${MYSQL_VERSION}_all.deb /
 # hard downloaded archived debian9 version (postgis 10-2.5), since apt support
 # for debian9 is dropped
-ADD conf/src/mysql-connector-odbc-5.3.14-linux-debian9-x86-64bit.tar.gz /
+COPY conf/src/mysql-connector-odbc-debian-9 /mysql-connector-odbc
 RUN . /etc/os-release; \
 	if [ "$VERSION_ID" = 9 ]; then \
-		cp /mysql-connector-odbc-5.3.14-linux-debian9-x86-64bit/bin/* /usr/bin; \
-		cp /mysql-connector-odbc-5.3.14-linux-debian9-x86-64bit/lib/* /usr/lib/x86_64-linux-gnu/odbc; \
+		cp /mysql-connector-odbc/bin/* /usr/bin; \
+		cp /mysql-connector-odbc/lib/* /usr/lib/x86_64-linux-gnu/odbc; \
 	else \
 		apt install -y lsb-release wget; \
 		dpkg -i /mysql-apt-config_${MYSQL_VERSION}_all.deb; \

diff --git a/base/postgis/conf/src/mysql-connector-odbc-5.3.14-linux-debian9-x86-64bit.tar.gz b/base/postgis/conf/src/mysql-connector-odbc-5.3.14-linux-debian9-x86-64bit.tar.gz
diff --git a/base/postgis/conf/src/mysql-connector-odbc-debian-9/bin/myodbc-installer b/base/postgis/conf/src/mysql-connector-odbc-debian-9/bin/myodbc-installer
diff --git a/base/postgis/conf/src/mysql-connector-odbc-debian-9/lib/libmyodbc8a.so b/base/postgis/conf/src/mysql-connector-odbc-debian-9/lib/libmyodbc8a.so
diff --git a/base/postgis/conf/src/mysql-connector-odbc-debian-9/lib/libmyodbc8w.so b/base/postgis/conf/src/mysql-connector-odbc-debian-9/lib/libmyodbc8w.so