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.

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
Show file tree
Hide file tree
Changes from 18 commits
Commits
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
10 changes: 2 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -321,15 +321,9 @@ endef
docker_lite:
${call build_docker_image,docker/lite/Dockerfile,vitess/lite}

DOCKER_LITE_SUFFIX = testing ubi7 ubi8 ubi8.arm64
DOCKER_LITE_TARGETS = $(addprefix docker_lite_,$(DOCKER_LITE_SUFFIX))
$(DOCKER_LITE_TARGETS): docker_lite_%:
${call build_docker_image,docker/lite/Dockerfile.$*,vitess/lite:$*}

docker_lite_push:
for i in $(DOCKER_LITE_SUFFIX); do echo "pushing lite image: $$i"; docker push vitess/lite:$$i || exit 1; done

docker_lite_all: docker_lite $(DOCKER_LITE_TARGETS)
echo "pushing lite image: latest"
docker push vitess/lite:latest

docker_local:
${call build_docker_image,docker/local/Dockerfile,vitess/local}
Expand Down
12 changes: 11 additions & 1 deletion docker/lite/Dockerfile
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 All @@ -36,6 +36,16 @@ RUN make install PREFIX=/vt/install
# Start over and build the final image.
FROM debian:bullseye-slim

# Install mysqlbinglog
RUN apt-get update && apt-get -y install libssl-dev gnupg
frouioui marked this conversation as resolved.
Show resolved Hide resolved
COPY --from=builder /usr/bin/mysqlbinlog /usr/bin/mysqlbinlog

# Install xtrabackup
RUN apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5
RUN echo 'deb http://repo.percona.com/apt bullseye main' > /etc/apt/sources.list.d/percona.list
RUN apt-get update -y
RUN apt-get install -y percona-xtrabackup-80

# Set up Vitess user and directory tree.
RUN groupadd -r vitess && useradd -r -g vitess vitess
RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt
Expand Down
57 changes: 0 additions & 57 deletions docker/lite/Dockerfile.testing

This file was deleted.

60 changes: 0 additions & 60 deletions docker/lite/Dockerfile.ubi7

This file was deleted.

61 changes: 0 additions & 61 deletions docker/lite/Dockerfile.ubi8

This file was deleted.

61 changes: 0 additions & 61 deletions docker/lite/Dockerfile.ubi8.arm64

This file was deleted.

Loading