Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gpg-key issue #781

Merged
merged 2 commits into from
May 22, 2024
Merged

Fix gpg-key issue #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
180b64f
Add `--ignore-table=mysql.user` to mysql-args
ishtiaqhimel May 21, 2024
9b5f340
Fix gpg-key issue
ArnobKumarSaha May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.dbg
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading