Skip to content

Commit 626d276

Browse files
committed
Release 4.1.0 - See CHANGELOG.md
1 parent f7f72ba commit 626d276

File tree

7 files changed

+61
-27
lines changed

7 files changed

+61
-27
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
11+
#uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
1212
#uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
13-
#uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
13+
uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
1414
secrets: inherit

.github/workflows/manual.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
build:
12-
uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
12+
#uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
1313
#uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
14-
#uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
14+
uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
1515
secrets: inherit

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 4.1.0 2024-05-25 <dave at tiredofit dot ca>
2+
3+
Note that arm/v7 builds have been removed from this release going forward
4+
5+
### Added
6+
- Introduce DEFAULT/DBXX_MYSQL_CLIENT option to use mariadb or mysql for client dumping to solve incompatibility issues
7+
- Alpine 3.20 Base
8+
- MariaDB 10.11.8 Client
9+
- AWS Client 1.32.113
10+
- MySQL Client 8.4.0
11+
12+
113
## 4.0.35 2024-01-14 <dave at tiredofit dot ca>
214

315
### Changed

Dockerfile

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG DISTRO=alpine
2-
ARG DISTRO_VARIANT=3.19
2+
ARG DISTRO_VARIANT=3.20
33

44
FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
55
LABEL maintainer="Dave Conroy (github.com/tiredofit)"
@@ -9,7 +9,9 @@ ENV INFLUX1_CLIENT_VERSION=1.8.0 \
99
INFLUX2_CLIENT_VERSION=2.7.3 \
1010
MSODBC_VERSION=18.3.2.1-1 \
1111
MSSQL_VERSION=18.3.1.1-1 \
12-
AWS_CLI_VERSION=1.31.5 \
12+
MYSQL_VERSION=mysql-8.4.0 \
13+
MYSQL_REPO_URL=https://github.com/mysql/mysql-server \
14+
AWS_CLI_VERSION=1.32.113 \
1315
CONTAINER_ENABLE_MESSAGING=TRUE \
1416
CONTAINER_ENABLE_MONITORING=TRUE \
1517
IMAGE_NAME="tiredofit/db-backup" \
@@ -27,11 +29,13 @@ RUN source /assets/functions/00-container && \
2729
build-base \
2830
bzip2-dev \
2931
cargo \
32+
cmake \
3033
git \
3134
go \
3235
libarchive-dev \
3336
openssl-dev \
3437
libffi-dev \
38+
ncurses-dev \
3539
python3-dev \
3640
py3-pip \
3741
xz-dev \
@@ -47,8 +51,10 @@ RUN source /assets/functions/00-container && \
4751
mariadb-client \
4852
mariadb-connector-c \
4953
mongodb-tools \
54+
ncurses \
5055
openssl \
5156
pigz \
57+
pixz \
5258
postgresql16 \
5359
postgresql16-client \
5460
pv \
@@ -81,24 +87,24 @@ RUN source /assets/functions/00-container && \
8187
clone_git_repo https://github.com/influxdata/influxdb "${INFLUX1_CLIENT_VERSION}" && \
8288
go build -o /usr/sbin/influxd ./cmd/influxd && \
8389
strip /usr/sbin/influxd && \
90+
\
91+
clone_git_repo "${MYSQL_REPO_URL}" "${MYSQL_VERSION}" && \
92+
cmake \
93+
-DCMAKE_BUILD_TYPE=MinSizeRel \
94+
-DCMAKE_INSTALL_PREFIX=/opt/mysql \
95+
-DFORCE_INSOURCE_BUILD=1 \
96+
-DWITHOUT_SERVER:BOOL=ON \
97+
&& \
98+
make -j$(nproc) install && \
99+
\
100+
pip3 install --break-system-packages awscli==${AWS_CLI_VERSION} && \
101+
pip3 install --break-system-packages blobxfer && \
102+
\
84103
mkdir -p /usr/src/pbzip2 && \
85104
curl -sSL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
86105
cd /usr/src/pbzip2 && \
87106
make && \
88107
make install && \
89-
mkdir -p /usr/src/pixz && \
90-
curl -sSL https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz | tar xvfJ - --strip 1 -C /usr/src/pixz && \
91-
cd /usr/src/pixz && \
92-
./configure \
93-
--prefix=/usr \
94-
--sysconfdir=/etc \
95-
--localstatedir=/var \
96-
&& \
97-
make && \
98-
make install && \
99-
\
100-
pip3 install --break-system-packages awscli==${AWS_CLI_VERSION} && \
101-
pip3 install --break-system-packages blobxfer && \
102108
\
103109
package remove .db-backup-build-deps && \
104110
package cleanup && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ Encryption occurs after compression and the encrypted filename will have a `.gpg
267267
| `DEFAULT_EXTRA_BACKUP_OPTS` | Pass extra arguments to the backup command only, add them here e.g. `--extra-command` | | |
268268
| `DEFAULT_EXTRA_ENUMERATION_OPTS` | Pass extra arguments to the database enumeration command only, add them here e.g. `--extra-command` | | |
269269
| `DEFAULT_EXTRA_OPTS` | Pass extra arguments to the backup and database enumeration command, add them here e.g. `--extra-command` | | |
270+
| `DEFAULT_MYSQL_CLIENT` | Choose between `mariadb` or `mysql` client to perform dump operations for compatibility purposes | `mariadb` | |
270271
| `DEFAULT_MYSQL_EVENTS` | Backup Events | `TRUE` | |
271272
| `DEFAULT_MYSQL_MAX_ALLOWED_PACKET` | Max allowed packet | `512M` | |
272273
| `DEFAULT_MYSQL_SINGLE_TRANSACTION` | Backup in a single transaction | `TRUE` | |

install/assets/defaults/10-db-backup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ DBBACKUP_USER=${DBBACKUP_USER:-"dbbackup"}
66
DBBACKUP_GROUP=${DBBACKUP_GROUP:-"${DBBACKUP_USER}"} # Must go after DBBACKUP_USER
77
DEFAULT_BACKUP_BEGIN=${DEFAULT_BACKUP_BEGIN:-+0}
88
DEFAULT_BACKUP_INTERVAL=${DEFAULT_BACKUP_INTERVAL:-1440}
9-
DEFAULT_BACKUP_INTERVAL=${DEFAULT_BACKUP_INTERVAL:-1440}
109
DEFAULT_BACKUP_LOCATION=${DEFAULT_BACKUP_LOCATION:-"FILESYSTEM"}
1110
DEFAULT_BLOBXFER_REMOTE_PATH=${DEFAULT_BLOBXFER_REMOTE_PATH:-"/docker-db-backup"}
1211
DEFAULT_CHECKSUM=${DEFAULT_CHECKSUM:-"MD5"}
@@ -20,6 +19,7 @@ DEFAULT_FILESYSTEM_PATH_PERMISSION=${DEFAULT_FILESYSTEM_PATH_PERMISSION:-"700"}
2019
DEFAULT_FILESYSTEM_PERMISSION=${DEFAULT_FILESYSTEM_PERMISSION:-"600"}
2120
DEFAULT_FILESYSTEM_ARCHIVE_PATH=${DEFAULT_FILESYSTEM_ARCHIVE_PATH:-"${DEFAULT_FILESYSTEM_PATH}/archive/"}
2221
DEFAULT_LOG_LEVEL=${DEFAULT_LOG_LEVEL:-"notice"}
22+
DEFAULT_MYSQL_CLIENT=${DEFAULT_MYSQL_CLIENT:-"mariadb"}
2323
DEFAULT_MYSQL_ENABLE_TLS=${DEFAULT_MYSQL_ENABLE_TLS:-"FALSE"}
2424
DEFAULT_MYSQL_EVENTS=${DEFAULT_MYSQL_EVENTS:-"TRUE"}
2525
DEFAULT_MYSQL_MAX_ALLOWED_PACKET=${DEFAULT_MYSQL_MAX_ALLOWED_PACKET:-"512M"}

install/assets/functions/10-db-backup

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ bootstrap_variables() {
221221
transform_backup_instance_variable "${backup_instance_number}" INFLUX_VERSION backup_job_influx_version
222222
transform_backup_instance_variable "${backup_instance_number}" LOG_LEVEL backup_job_log_level
223223
transform_backup_instance_variable "${backup_instance_number}" MONGO_CUSTOM_URI backup_job_mongo_custom_uri
224+
transform_backup_instance_variable "${backup_instance_number}" MYSQL_CLIENT backup_job_mysql_client
224225
transform_backup_instance_variable "${backup_instance_number}" MYSQL_ENABLE_TLS backup_job_mysql_enable_tls
225226
transform_backup_instance_variable "${backup_instance_number}" MYSQL_EVENTS backup_job_mysql_events
226227
transform_backup_instance_variable "${backup_instance_number}" MYSQL_MAX_ALLOWED_PACKET backup_job_mysql_max_allowed_packet
@@ -401,6 +402,20 @@ EOF
401402
dbtype=mysql
402403
backup_job_db_port=${backup_job_db_port:-3306}
403404
check_var backup_job_db_name DB"${v_instance}"_NAME "database name. Seperate multiple with commas"
405+
case "${backup_job_mysql_client,,}" in
406+
mariadb )
407+
_mysql_prefix=/usr/bin/
408+
;;
409+
mysql )
410+
_mysql_prefix=/opt/mysql/bin/
411+
;;
412+
* )
413+
print_error "I don't understand '${backup_job_mysql_client,,}' as a client. Exiting.."
414+
exit 99
415+
;;
416+
esac
417+
418+
print_debug "Using '${backup_job_mysql_client,,}' as client"
404419

405420
if [ -n "${backup_job_db_pass}" ] ; then export MYSQL_PWD=${backup_job_db_pass} ; fi
406421
if var_true "${backup_job_mysql_enable_tls}" ; then
@@ -665,7 +680,7 @@ backup_mysql() {
665680

666681
if [ "${backup_job_db_name,,}" = "all" ] ; then
667682
write_log debug "Preparing to back up everything except for information_schema and _* prefixes"
668-
db_names=$(run_as_user mysql -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_enumeration_opts} --batch -e "SHOW DATABASES;" | grep -v Database | grep -v schema )
683+
db_names=$(run_as_user ${_mysql_prefix}mysql -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_enumeration_opts} --batch -e "SHOW DATABASES;" | grep -v Database | grep -v schema )
669684
if [ -n "${backup_job_db_name_exclude}" ] ; then
670685
db_names_exclusions=$(echo "${backup_job_db_name_exclude}" | tr ',' '\n')
671686
for db_exclude in ${db_names_exclusions} ; do
@@ -682,13 +697,13 @@ backup_mysql() {
682697
if var_true "${backup_job_split_db}" ; then
683698
for db in ${db_names} ; do
684699
prepare_dbbackup
685-
backup_job_filename=mysql_${db}_${backup_job_db_host,,}_${now}.sql
686-
backup_job_filename_base=mysql_${db}_${backup_job_db_host,,}
700+
backup_job_filename=${backup_job_mysql_client,,}_${db}_${backup_job_db_host,,}_${now}.sql
701+
backup_job_filename_base=${backup_job_mysql_client,,}_${db}_${backup_job_db_host,,}
687702
compression
688703
pre_dbbackup "${db}"
689704
write_log notice "Dumping MySQL/MariaDB database: '${db}' ${compression_string}"
690705
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
691-
run_as_user ${play_fair} mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} $db | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
706+
run_as_user ${play_fair} ${_mysql_prefix}mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} $db | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
692707
exit_code=$?
693708
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
694709
check_exit_code backup "${backup_job_filename}"
@@ -703,13 +718,13 @@ backup_mysql() {
703718
else
704719
write_log debug "Not splitting database dumps into their own files"
705720
prepare_dbbackup
706-
backup_job_filename=mysql_all_${backup_job_db_host,,}_${now}.sql
707-
backup_job_filename_base=mysql_all_${backup_job_db_host,,}
721+
backup_job_filename=${backup_job_mysql_client,,}_all_${backup_job_db_host,,}_${now}.sql
722+
backup_job_filename_base=${backup_job_mysql_client,,}_all_${backup_job_db_host,,}
708723
compression
709724
pre_dbbackup all
710725
write_log notice "Dumping all MySQL / MariaDB databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}"
711726
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
712-
run_as_user ${play_fair} mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
727+
run_as_user ${play_fair} ${_mysql_prefix}mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
713728
exit_code=$?
714729
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
715730
check_exit_code backup "${backup_job_filename}"

0 commit comments

Comments
 (0)