Skip to content

Commit

Permalink
K8SPS-238 - Update docker images for router, orchestrator, toolkit and (
Browse files Browse the repository at this point in the history
#777)

haproxy
  • Loading branch information
tplavcic authored Mar 28, 2023
1 parent 9910238 commit 8030675
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions haproxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.18 AS go_builder
FROM golang:1.20 AS go_builder
WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/src

RUN export GO111MODULE=off \
&& go get k8s.io/apimachinery/pkg/util/sets \
&& curl -Lf -o /go/src/github.com/percona/percona-xtradb-cluster-operator/src/peer-list.go https://raw.githubusercontent.com/percona/percona-xtradb-cluster-operator/main/cmd/peer-list/main.go \
&& go build peer-list.go

FROM redhat/ubi8-minimal AS ubi8
FROM redhat/ubi9-minimal AS ubi9

LABEL name="HAproxy" \
description="TCP proxy loadbalancer for Percona Xtradb Cluster" \
Expand All @@ -17,22 +17,22 @@ LABEL name="HAproxy" \
# check repository package signature in secure way
RUN export GNUPGHOME="$(mktemp -d)" \
&& microdnf install -y findutils \
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 76FD3DB13AB67410B89DB10E82562EA9AD986DA3 \
&& gpg --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F \
&& gpg --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona \
&& gpg --export --armor 76FD3DB13AB67410B89DB10E82562EA9AD986DA3 > ${GNUPGHOME}/RPM-GPG-KEY-oracle \
&& gpg --export --armor 3E6D826D3FBAB389C2F38E34BC4D06A08D8B756F > ${GNUPGHOME}/RPM-GPG-KEY-oracle \
&& rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-oracle \
&& curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm \
&& rpmkeys --checksig /tmp/percona-release.rpm \
&& rpm -i /tmp/percona-release.rpm \
&& rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
&& rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
&& percona-release setup pdpxc-8.0.29
&& percona-release setup pdpxc-8.0.31

# install exact version of PS for repeatability
ENV PERCONA_VERSION 8.0.29-21.1.el8
ENV PERCONA_VERSION 8.0.31-23.1.el9

RUN set -ex; \
curl -Lf -o /tmp/krb5-libs.rpm https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64/getPackage/krb5-libs-1.18.2-22.0.1.el8_7.x86_64.rpm; \
curl -Lf -o /tmp/krb5-libs.rpm https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64/getPackage/krb5-libs-1.19.1-24.0.1.el9_1.x86_64.rpm; \
rpmkeys --checksig /tmp/krb5-libs.rpm; \
rpm -U /tmp/krb5-libs.rpm; \
rm -rf /tmp/krb5-libs.rpm; \
Expand Down
8 changes: 4 additions & 4 deletions mysql-router/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM redhat/ubi8-minimal AS ubi8
FROM redhat/ubi9-minimal AS ubi9

LABEL name="mysql-router" \
description="MySQL Router is lightweight middleware that provides transparent routing between your application and back-end MySQL Servers" \
vendor="Percona" \
summary="MySQL Router is lightweight middleware that provides transparent routing between your application and back-end MySQL Servers" \
org.opencontainers.image.authors="[email protected]"

ENV ROUTE_VERSION 8.0.31-23.1
ENV MYSQL_SHELL_VERSION 8.0.31-1
ENV OS_VER el8
ENV ROUTE_VERSION 8.0.32-24.1
ENV MYSQL_SHELL_VERSION 8.0.32-1
ENV OS_VER el9
ENV FULL_ROUTE_VERSION "$ROUTE_VERSION.$OS_VER"
ENV FULL_MYSQL_SHELL_VERSION "$MYSQL_SHELL_VERSION.$OS_VER"

Expand Down
8 changes: 4 additions & 4 deletions orchestrator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.18 AS go_builder
FROM golang:1.20 AS go_builder
WORKDIR /go/src/github.com/percona/percona-server-mysql-operator/src

RUN export GO111MODULE=off \
&& go get k8s.io/apimachinery/pkg/util/sets \
&& curl -Lf -o /go/src/github.com/percona/percona-server-mysql-operator/src/peer-list.go https://raw.githubusercontent.com/percona/percona-server-mysql-operator/main/cmd/peer-list/main.go \
&& go build peer-list.go

FROM redhat/ubi8-minimal AS ubi8
FROM redhat/ubi9-minimal AS ubi9

LABEL name="orchestrator" \
description="orchestrator is a MySQL high availability and replication management tool" \
Expand All @@ -25,8 +25,8 @@ RUN export GNUPGHOME="$(mktemp -d)" \
&& rpm -i /tmp/percona-release.rpm \
&& rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
&& rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
&& percona-release setup pdps-8.0.31 \
&& percona-release enable-only pdps-8.0.31 testing
&& percona-release setup pdps-8.0.32 \
&& percona-release enable-only pdps-8.0.32 release

RUN set -ex; \
microdnf install -y \
Expand Down
4 changes: 2 additions & 2 deletions percona-toolkit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ LABEL name="Percona Toolkit" \
RUN microdnf -y update; \
microdnf -y install glibc-langpack-en

ENV PS_VERSION 8.0.31-23.1.el9
ENV PT_VERSION 3.5.1-2.el9
ENV PS_VERSION 8.0.32-24.1.el9
ENV PT_VERSION 3.5.2-2.el9

# check repository package signature in secure way
RUN set -ex; \
Expand Down

0 comments on commit 8030675

Please sign in to comment.