From ff7c7d6298b609ad9d5ea48957b20850d91497ef Mon Sep 17 00:00:00 2001 From: Arnob Kumar Saha Date: Wed, 22 May 2024 17:30:13 +0600 Subject: [PATCH] Fix gpg-key issue (#781) Signed-off-by: Md. Ishtiaq Islam Signed-off-by: Arnob kumar saha Co-authored-by: Md. Ishtiaq Islam --- Dockerfile.dbg | 2 +- Dockerfile.in | 4 ++-- pkg/backup.go | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile.dbg b/Dockerfile.dbg index 665cfbc9..2bf82314 100644 --- a/Dockerfile.dbg +++ b/Dockerfile.dbg @@ -46,7 +46,7 @@ RUN mkdir ~/.gnupg RUN echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf RUN set -x \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B7B3B788A8D3785C + && wget -qO- http://keyserver.ubuntu.com:80/pks/lookup?op=get&search=0xB7B3B788A8D3785C > /etc/apt/trusted.gpg.d/myrepo.asc RUN set -x \ && apt-get update \ diff --git a/Dockerfile.in b/Dockerfile.in index 9ca16383..31bad936 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:bookworm ENV DEBIAN_FRONTEND noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN true @@ -46,7 +46,7 @@ RUN mkdir ~/.gnupg RUN echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf RUN set -x \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B7B3B788A8D3785C + && wget -qO- http://keyserver.ubuntu.com:80/pks/lookup?op=get&search=0xB7B3B788A8D3785C > /etc/apt/trusted.gpg.d/myrepo.asc RUN set -x \ && apt-get update \ diff --git a/pkg/backup.go b/pkg/backup.go index 0e3f4940..1b86f0f0 100644 --- a/pkg/backup.go +++ b/pkg/backup.go @@ -19,6 +19,7 @@ package pkg import ( "context" "path/filepath" + "strings" api_v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" stash "stash.appscode.dev/apimachinery/client/clientset/versioned" @@ -221,6 +222,9 @@ func (opt *mysqlOptions) backupMySQL(targetRef api_v1beta1.TargetRef) (*restic.B } session.setUserArgs(opt.myArgs) + if strings.Contains(opt.myArgs, "--all-databases") { + session.cmd.Args = append(session.cmd.Args, "--ignore-table=mysql.user") + } // add backup command in the pipeline opt.backupOptions.StdinPipeCommands = append(opt.backupOptions.StdinPipeCommands, *session.cmd)