Drop MariaDB 10.1

wodby · Sep 8, 2020 · 95f21a8 · 95f21a8
1 parent 02a3511
commit 95f21a8
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 317 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -77,21 +77,6 @@ jobs:
     - run: make test
     - run: . ../release.sh
 
-  mariadb-101:
-    working_directory: ~/repo/10
-    machine: true
-    environment:
-    - ALPINE_VER: 3.8
-    - BASE_IMAGE_STABILITY_TAG: 2.5.0
-    - MARIADB_VER: 10.1.46
-    - TAGS: 10.1
-    steps:
-    - checkout:
-        path: ~/repo
-    - run: make
-    - run: make test
-    - run: . ../release.sh
-
 workflows:
   build-test-release:
     jobs:
@@ -115,7 +100,3 @@ workflows:
         filters:
           tags:
             only: /.*/
-    - mariadb-101:
-        filters:
-          tags:
-            only: /.*/
diff --git a/10/Dockerfile b/10/Dockerfile
@@ -42,8 +42,7 @@ RUN set -xe; \
         gnupg \
         libaio-dev \
         linux-pam-dev \
-        # MariaDB 10.1 does not support OpenSSL 1.1.
-        $(test "${MARIADB_VER:0:4}" = "10.1" && echo 'libressl-dev' || echo 'openssl-dev') \
+        openssl-dev \
         linux-headers \
         ncurses-dev \
         patch \

diff --git a/10/patches/10.1/fix-mysql-install-db-path.patch b/10/patches/10.1/fix-mysql-install-db-path.patch
diff --git a/10/patches/10.1/pcre.cmake.patch b/10/patches/10.1/pcre.cmake.patch
diff --git a/10/patches/10.1/ppc-remove-glibc-dep.patch b/10/patches/10.1/ppc-remove-glibc-dep.patch
diff --git a/10/templates/10.1/my.cnf.tmpl b/10/templates/10.1/my.cnf.tmpl