Skip to content

Commit

Permalink
Add licenses and labeling to the UBI images to conform to the RH
Browse files Browse the repository at this point in the history
container catalog requirements.

Signed-off-by: Jacques Grove <[email protected]>
  • Loading branch information
aquarapid committed Apr 25, 2020
1 parent ea1ad68 commit 14c2f08
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 0 deletions.
15 changes: 15 additions & 0 deletions docker/lite/Dockerfile.ubi7.mysql57
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,21 @@ ENV PATH $VTROOT/bin:$PATH
# Copy artifacts from builder layer.
COPY --from=builder --chown=vitess:vitess /vt/install /vt

RUN mkdir -p /licenses
COPY LICENSE /licenses

# Create mount point for actual data (e.g. MySQL data dir)
VOLUME /vt/vtdataroot
USER vitess

LABEL name="Vitess Lite image - MySQL Community Server 5.7" \
io.k8s.display-name="Vitess Lite image - MySQL Community Server 5.7" \
maintainer="[email protected]" \
vendor="CNCF" \
version="6.0.0" \
release="1" \
summary="Vitess base container image, containing Vitess components along with MySQL Community Server 5.7" \
description="Vitess base container image, containing Vitess components along with MySQL Community Server 5.7" \
io.k8s.description="Vitess base container image, containing Vitess components along with MySQL Community Server 5.7" \
distribution-scope="public" \
url="https://vitess.io"
15 changes: 15 additions & 0 deletions docker/lite/Dockerfile.ubi7.mysql80
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,21 @@ ENV MYSQL_FLAVOR MySQL80
# Copy artifacts from builder layer.
COPY --from=builder --chown=vitess:vitess /vt/install /vt

RUN mkdir -p /licenses
COPY LICENSE /licenses

# Create mount point for actual data (e.g. MySQL data dir)
VOLUME /vt/vtdataroot
USER vitess

LABEL name="Vitess Lite image - MySQL Community Server 8.0" \
io.k8s.display-name="Vitess Lite image - MySQL Community Server 8.0" \
maintainer="[email protected]" \
vendor="CNCF" \
version="6.0.0" \
release="1" \
summary="Vitess base container image, containing Vitess components along with MySQL Community Server 8.0" \
description="Vitess base container image, containing Vitess components along with MySQL Community Server 8.0" \
io.k8s.description="Vitess base container image, containing Vitess components along with MySQL Community Server 8.0" \
distribution-scope="public" \
url="https://vitess.io"
15 changes: 15 additions & 0 deletions docker/lite/Dockerfile.ubi7.percona57
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,21 @@ ENV PATH $VTROOT/bin:$PATH
# Copy artifacts from builder layer.
COPY --from=builder --chown=vitess:vitess /vt/install /vt

RUN mkdir -p /licenses
COPY LICENSE /licenses

# Create mount point for actual data (e.g. MySQL data dir)
VOLUME /vt/vtdataroot
USER vitess

LABEL name="Vitess Lite image - Percona Server 5.7" \
io.k8s.display-name="Vitess Lite image - Percona Server 5.7" \
maintainer="[email protected]" \
vendor="CNCF" \
version="6.0.0" \
release="1" \
summary="Vitess base container image, containing Vitess components along with Percona Server 5.7" \
description="Vitess base container image, containing Vitess components along with Percona Server 5.7" \
io.k8s.description="Vitess base container image, containing Vitess components along with Percona Server 5.7" \
distribution-scope="public" \
url="https://vitess.io"
15 changes: 15 additions & 0 deletions docker/lite/Dockerfile.ubi7.percona80
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,21 @@ ENV MYSQL_FLAVOR MySQL80
# Copy artifacts from builder layer.
COPY --from=builder --chown=vitess:vitess /vt/install /vt

RUN mkdir -p /licenses
COPY LICENSE /licenses

# Create mount point for actual data (e.g. MySQL data dir)
VOLUME /vt/vtdataroot
USER vitess

LABEL name="Vitess Lite image - Percona Server 8.0" \
io.k8s.display-name="Vitess Lite image - Percona Server 8.0" \
maintainer="[email protected]" \
vendor="CNCF" \
version="6.0.0" \
release="1" \
summary="Vitess base container image, containing Vitess components along with Percona Server 8.0" \
description="Vitess base container image, containing Vitess components along with Percona Server 8.0" \
io.k8s.description="Vitess base container image, containing Vitess components along with Percona Server 8.0" \
distribution-scope="public" \
url="https://vitess.io"

0 comments on commit 14c2f08

Please sign in to comment.