From 604f38349be8f110c00503460ba75b815fcaa866 Mon Sep 17 00:00:00 2001 From: Dan Kozlowski Date: Fri, 23 Oct 2020 08:32:41 -0700 Subject: [PATCH 1/4] Change dependencies for lite builds Signed-off-by: Dan Kozlowski --- docker/lite/install_dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index b9a05da3aa5..a813b4f491d 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -34,10 +34,9 @@ BASE_PACKAGES=( gnupg libaio1 libatomic1 - libcurl3 + libcurl4 libdbd-mysql-perl libev4 - libjemalloc1 libtcmalloc-minimal4 procps rsync From 2fc90e594154e1f724f50b6e0b7d953c0e5aaee4 Mon Sep 17 00:00:00 2001 From: Dan Kozlowski Date: Fri, 23 Oct 2020 10:15:39 -0700 Subject: [PATCH 2/4] Adding back jemalloc Signed-off-by: Dan Kozlowski --- docker/lite/install_dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index a813b4f491d..c49777a3ec1 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -37,6 +37,7 @@ BASE_PACKAGES=( libcurl4 libdbd-mysql-perl libev4 + libjemalloc2 libtcmalloc-minimal4 procps rsync From dade60beffb7af6c56dd3ef59e704fa7514e9549 Mon Sep 17 00:00:00 2001 From: Dan Kozlowski Date: Fri, 23 Oct 2020 16:38:44 -0700 Subject: [PATCH 3/4] Ping MySQL 5.7 to a supported version Signed-off-by: Dan Kozlowski --- docker/lite/install_dependencies.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index c49777a3ec1..8492a32c81d 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -60,10 +60,17 @@ mysql56) ) ;; mysql57) + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_5.7.31-1debian10_amd64.deb -O /tmp/libmysqlclient20_5.7.31-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_5.7.31-1debian10_amd64.deb -O /tmp/mysql-community-client_5.7.31-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_5.7.31-1debian10_amd64.deb -O /tmp/mysql-client_5.7.31-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_5.7.31-1debian10_amd64.deb -O /tmp/mysql-community-server_5.7.31-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_5.7.31-1debian10_amd64.deb -O /tmp/mysql-server_5.7.31-1debian10_amd64.deb PACKAGES=( - libmysqlclient20 - mysql-client - mysql-server + /tmp/libmysqlclient20_5.7.31-1debian10_amd64.deb + /tmp/mysql-community-client_5.7.31-1debian10_amd64.deb + /tmp/mysql-client_5.7.31-1debian10_amd64.deb + /tmp/mysql-community-server_5.7.31-1debian10_amd64.deb + /tmp/mysql-server_5.7.31-1debian10_amd64.deb percona-xtrabackup-24 ) ;; From 66d8851f3224485d2c8d5e15a6de20e893a3ab5d Mon Sep 17 00:00:00 2001 From: Dan Kozlowski Date: Sat, 24 Oct 2020 17:16:19 -0700 Subject: [PATCH 4/4] Pinning MySQL 8.0 as well Signed-off-by: Dan Kozlowski --- docker/lite/install_dependencies.sh | 40 +++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh index 8492a32c81d..381d38ce16d 100755 --- a/docker/lite/install_dependencies.sh +++ b/docker/lite/install_dependencies.sh @@ -60,25 +60,38 @@ mysql56) ) ;; mysql57) - wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_5.7.31-1debian10_amd64.deb -O /tmp/libmysqlclient20_5.7.31-1debian10_amd64.deb - wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_5.7.31-1debian10_amd64.deb -O /tmp/mysql-community-client_5.7.31-1debian10_amd64.deb - wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_5.7.31-1debian10_amd64.deb -O /tmp/mysql-client_5.7.31-1debian10_amd64.deb - wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_5.7.31-1debian10_amd64.deb -O /tmp/mysql-community-server_5.7.31-1debian10_amd64.deb - wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_5.7.31-1debian10_amd64.deb -O /tmp/mysql-server_5.7.31-1debian10_amd64.deb + mysql57_version=5.7.31 + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb -O /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-client_${mysql57_version}-1debian10_amd64.deb -O /tmp/mysql-community-client_${mysql57_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-client_${mysql57_version}-1debian10_amd64.deb -O /tmp/mysql-client_${mysql57_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-community-server_${mysql57_version}-1debian10_amd64.deb -O /tmp/mysql-community-server_${mysql57_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/mysql-server_${mysql57_version}-1debian10_amd64.deb -O /tmp/mysql-server_${mysql57_version}-1debian10_amd64.deb PACKAGES=( - /tmp/libmysqlclient20_5.7.31-1debian10_amd64.deb - /tmp/mysql-community-client_5.7.31-1debian10_amd64.deb - /tmp/mysql-client_5.7.31-1debian10_amd64.deb - /tmp/mysql-community-server_5.7.31-1debian10_amd64.deb - /tmp/mysql-server_5.7.31-1debian10_amd64.deb + /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-community-client_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-client_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-community-server_${mysql57_version}-1debian10_amd64.deb + /tmp/mysql-server_${mysql57_version}-1debian10_amd64.deb percona-xtrabackup-24 ) ;; mysql80) + mysql8_version=8.0.21 + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb -O /tmp/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb -O /tmp/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client_${mysql8_version}-1debian10_amd64.deb -O /tmp/mysql-community-client_${mysql8_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-client_${mysql8_version}-1debian10_amd64.deb -O /tmp/mysql-client_${mysql8_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb -O /tmp/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-server_${mysql8_version}-1debian10_amd64.deb -O /tmp/mysql-community-server_${mysql8_version}-1debian10_amd64.deb + wget https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-server_${mysql8_version}-1debian10_amd64.deb -O /tmp/mysql-server_${mysql8_version}-1debian10_amd64.deb PACKAGES=( - libmysqlclient21 - mysql-client - mysql-server + /tmp/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-community-client_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-client_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-community-server-core_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-community-server_${mysql8_version}-1debian10_amd64.deb + /tmp/mysql-server_${mysql8_version}-1debian10_amd64.deb percona-xtrabackup-80 ) ;; @@ -192,3 +205,4 @@ apt-get install -y --no-install-recommends "${PACKAGES[@]}" # Clean up files we won't need in the final image. rm -rf /var/lib/apt/lists/* rm -rf /var/lib/mysql/ +rm -rf /tmp/*.deb