Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mysqlbinlog and xtrabackup to the vitess/lite image #15775

Merged
merged 19 commits into from
Apr 24, 2024
Merged

Add mysqlbinlog and xtrabackup to the vitess/lite image #15775

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
06a711b
Add mysqlbinlog to the lite image
frouioui Apr 22, 2024
7fc8f03
Copy dynamic linker
frouioui Apr 22, 2024
6806bf6
Copy linker to testing and ubi7
frouioui Apr 22, 2024
b0dafc8
Copy libssl and libcrypto from centos8
frouioui Apr 22, 2024
54a173a
Remove copies in centos7
frouioui Apr 22, 2024
cf9f0eb
Install libraries with apt
frouioui Apr 23, 2024
202d4f2
Install only libssl in normal lite image
frouioui Apr 23, 2024
2dccf2a
Fix debian base lite image
frouioui Apr 23, 2024
535e20a
Use correct vtroot in lite.testing
frouioui Apr 23, 2024
821d2fe
Add mysqlbinlog to ubi8 image
frouioui Apr 23, 2024
ed658a6
Add mysqlbinlog to ubi7 and install openssl-devel
frouioui Apr 23, 2024
ceb7ba6
Fix yum install command
frouioui Apr 23, 2024
4473111
Remove ubi7/8 lite images
frouioui Apr 23, 2024
31fecd6
Remove unrequired new line
frouioui Apr 23, 2024
e69863c
Copy xtrabackup from builder to final image
frouioui Apr 23, 2024
6bea2ed
Download xtrabackup from repo
frouioui Apr 23, 2024
2a3007c
Auto yes when doing apt-get install
frouioui Apr 23, 2024
4931593
Remove the lite.testing image and simplify makefile
frouioui Apr 23, 2024
d896a3b
Download libssl1.1 instead of libssl-devel
frouioui Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docker/lite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# Use a temporary layer for the build stage.
ARG bootstrap_version=31
ARG image="vitess/bootstrap:${bootstrap_version}-common"
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder

Expand Down Expand Up @@ -51,6 +51,8 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/init_db.sql /vt/config/
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/mycnf /vt/config/
COPY --from=builder /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
COPY --from=builder /usr/bin/mysqlbinlog /usr/bin/mysqlbinlog

# Create mount point for actual data (e.g. MySQL data dir)
VOLUME /vt/vtdataroot
Expand Down
4 changes: 3 additions & 1 deletion docker/lite/Dockerfile.testing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# Use a temporary layer for the build stage.
ARG bootstrap_version=31
ARG image="vitess/bootstrap:${bootstrap_version}-common"
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder

Expand Down Expand Up @@ -51,6 +51,8 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/init_db.sql /vt/config/
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/mycnf /vt/config/
COPY --from=builder /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
COPY --from=builder /usr/bin/mysqlbinlog /usr/bin/mysqlbinlog

# Create mount point for actual data (e.g. MySQL data dir)
VOLUME /vt/vtdataroot
Expand Down
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# Use a temporary layer for the build stage.
ARG bootstrap_version=31
ARG image="vitess/bootstrap:${bootstrap_version}-common"
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder

Expand Down Expand Up @@ -51,6 +51,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/init_db.sql /vt/config/
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/mycnf /vt/config/
COPY --from=builder /usr/bin/mysqlbinlog /usr/bin/mysqlbinlog

RUN mkdir -p /licenses
COPY LICENSE /licenses
Expand Down
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# Use a temporary layer for the build stage.
ARG bootstrap_version=31
ARG image="vitess/bootstrap:${bootstrap_version}-common"
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder

Expand Down Expand Up @@ -51,6 +51,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/init_db.sql /vt/config/
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/mycnf /vt/config/
COPY --from=builder /usr/bin/mysqlbinlog /usr/bin/mysqlbinlog
frouioui marked this conversation as resolved.
Show resolved Hide resolved

RUN mkdir -p /licenses
COPY LICENSE /licenses
Expand Down
3 changes: 2 additions & 1 deletion docker/lite/Dockerfile.ubi8.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# Use a temporary layer for the build stage.
ARG bootstrap_version=31
ARG image="vitess/bootstrap:${bootstrap_version}-common"
ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"

FROM "${image}" AS builder

Expand Down Expand Up @@ -51,6 +51,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/init_db.sql /vt/config/
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/config/mycnf /vt/config/
COPY --from=builder /usr/bin/mysqlbinlog /usr/bin/mysqlbinlog

RUN mkdir -p /licenses
COPY LICENSE /licenses
Expand Down