From 6df6b0d89d290c54b32550adc501772ee92fca05 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 3 Apr 2024 17:07:56 -0600 Subject: [PATCH] Copy config folder in lite image Signed-off-by: Florent Poinsard --- docker/lite/Dockerfile | 2 ++ docker/lite/Dockerfile.testing | 2 ++ docker/lite/Dockerfile.ubi7 | 2 ++ docker/lite/Dockerfile.ubi8 | 2 ++ docker/lite/Dockerfile.ubi8.arm64 | 2 ++ 5 files changed, 10 insertions(+) diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile index ff65d858dad..89e0cd8bd6a 100644 --- a/docker/lite/Dockerfile +++ b/docker/lite/Dockerfile @@ -48,6 +48,8 @@ ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. 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/ # Create mount point for actual data (e.g. MySQL data dir) VOLUME /vt/vtdataroot diff --git a/docker/lite/Dockerfile.testing b/docker/lite/Dockerfile.testing index c6a34df2784..8a1d7121f69 100644 --- a/docker/lite/Dockerfile.testing +++ b/docker/lite/Dockerfile.testing @@ -48,6 +48,8 @@ ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. 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/ # Create mount point for actual data (e.g. MySQL data dir) VOLUME /vt/vtdataroot diff --git a/docker/lite/Dockerfile.ubi7 b/docker/lite/Dockerfile.ubi7 index 52cebdc15b7..baab4f5f50b 100644 --- a/docker/lite/Dockerfile.ubi7 +++ b/docker/lite/Dockerfile.ubi7 @@ -48,6 +48,8 @@ ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. 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/ RUN mkdir -p /licenses COPY LICENSE /licenses diff --git a/docker/lite/Dockerfile.ubi8 b/docker/lite/Dockerfile.ubi8 index 36ef69e5867..ea933184d5e 100644 --- a/docker/lite/Dockerfile.ubi8 +++ b/docker/lite/Dockerfile.ubi8 @@ -48,6 +48,8 @@ ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. 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/ RUN mkdir -p /licenses COPY LICENSE /licenses diff --git a/docker/lite/Dockerfile.ubi8.arm64 b/docker/lite/Dockerfile.ubi8.arm64 index a5efb9daa8f..a4b518be74e 100644 --- a/docker/lite/Dockerfile.ubi8.arm64 +++ b/docker/lite/Dockerfile.ubi8.arm64 @@ -48,6 +48,8 @@ ENV PATH $VTROOT/bin:$PATH # Copy artifacts from builder layer. 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/ RUN mkdir -p /licenses COPY LICENSE /licenses