Skip to content

Commit

Permalink
Fix gpg-key issue (#781)
Browse files Browse the repository at this point in the history
Signed-off-by: Md. Ishtiaq Islam <ishtiaq@appscode.com>
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
Co-authored-by: Md. Ishtiaq Islam <ishtiaq@appscode.com>
  • Loading branch information
ArnobKumarSaha and ishtiaqhimel authored May 22, 2024
1 parent bddcbc5 commit ff7c7d6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dbg
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions pkg/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ff7c7d6

Please sign in to comment.