From ffd75d9a1fad2d0d5ebc6984351ccc4fc8e159d2 Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Thu, 4 Jan 2024 17:07:28 +0200 Subject: [PATCH] K8SPXC-1263 fix orchestrator pxc5.7 and pxc8.0 images (#898) --- percona-xtradb-cluster-5.7/Dockerfile | 10 ++++------ percona-xtradb-cluster-5.7/Dockerfile.k8s | 10 ++++------ percona-xtradb-cluster-8.0/Dockerfile | 12 +++++------- percona-xtradb-cluster-8.0/Dockerfile.k8s | 12 +++++------- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/percona-xtradb-cluster-5.7/Dockerfile b/percona-xtradb-cluster-5.7/Dockerfile index 379183e8..cf4a0aaa 100644 --- a/percona-xtradb-cluster-5.7/Dockerfile +++ b/percona-xtradb-cluster-5.7/Dockerfile @@ -1,10 +1,8 @@ FROM golang:1.21 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 +RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/ +WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list +RUN go build FROM redhat/ubi8-minimal @@ -110,7 +108,7 @@ RUN cp /usr/share/doc/percona-xtradb-cluster-galera/COPYING /licenses/LICENSE.ga cp /usr/share/doc/percona-xtradb-cluster-galera/LICENSE.* /licenses/ COPY dockerdir / -COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/src/peer-list /usr/bin/ +COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/ RUN set -ex; \ rm -rf /etc/my.cnf.d; \ diff --git a/percona-xtradb-cluster-5.7/Dockerfile.k8s b/percona-xtradb-cluster-5.7/Dockerfile.k8s index 3aa73b89..9995777c 100644 --- a/percona-xtradb-cluster-5.7/Dockerfile.k8s +++ b/percona-xtradb-cluster-5.7/Dockerfile.k8s @@ -1,10 +1,8 @@ FROM golang:1.21 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 +RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/ +WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list +RUN go build FROM redhat/ubi8-minimal @@ -127,7 +125,7 @@ RUN cp /usr/share/doc/percona-xtradb-cluster-galera/COPYING /licenses/LICENSE.ga cp /usr/share/doc/percona-xtradb-cluster-galera/LICENSE.* /licenses/ COPY dockerdir / -COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/src/peer-list /usr/bin/ +COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/ RUN rmdir /etc/my.cnf.d; \ ln -s /etc/mysql/conf.d /etc/my.cnf.d; \ diff --git a/percona-xtradb-cluster-8.0/Dockerfile b/percona-xtradb-cluster-8.0/Dockerfile index 158c27f2..e1679731 100644 --- a/percona-xtradb-cluster-8.0/Dockerfile +++ b/percona-xtradb-cluster-8.0/Dockerfile @@ -1,10 +1,8 @@ -FROM golang:1.19 AS go_builder -WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/src +FROM golang:1.21 AS go_builder -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 +RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/ +WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list +RUN go build FROM redhat/ubi8-minimal @@ -104,7 +102,7 @@ RUN cp /usr/share/doc/percona-xtradb-cluster-galera/COPYING /licenses/LICENSE.ga cp /usr/share/doc/percona-xtradb-cluster-galera/LICENSE.* /licenses/ COPY dockerdir / -COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/src/peer-list /usr/bin/ +COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/ RUN set -ex; \ rmdir /etc/my.cnf.d; \ diff --git a/percona-xtradb-cluster-8.0/Dockerfile.k8s b/percona-xtradb-cluster-8.0/Dockerfile.k8s index de876670..844155ad 100644 --- a/percona-xtradb-cluster-8.0/Dockerfile.k8s +++ b/percona-xtradb-cluster-8.0/Dockerfile.k8s @@ -1,10 +1,8 @@ -FROM golang:1.19 AS go_builder -WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/src +FROM golang:1.21 AS go_builder -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 +RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/ +WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list +RUN go build FROM redhat/ubi8-minimal @@ -113,7 +111,7 @@ RUN set -ex; \ echo '!includedir /etc/percona-xtradb-cluster.conf.d/' >> /etc/my.cnf COPY dockerdir / -COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/src/peer-list /usr/bin/ +COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/ RUN mkdir -p /etc/mysql/conf.d/ /var/log/mysql /var/lib/mysql /docker-entrypoint-initdb.d /etc/percona-xtradb-cluster.conf.d; \ chown -R 1001:1001 /etc/mysql/ /var/log/mysql /var/lib/mysql /docker-entrypoint-initdb.d /etc/percona-xtradb-cluster.conf.d; \ chmod -R g=u /etc/mysql/ /var/log/mysql /var/lib/mysql /docker-entrypoint-initdb.d /etc/percona-xtradb-cluster.conf.d