Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/go_modules/github.com/prometheu…
Browse files Browse the repository at this point in the history
…s/client_model-0.6.0
  • Loading branch information
mergify[bot] authored Feb 23, 2024
2 parents fecb137 + 445ffe6 commit c03d632
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docker/postgres-kanister-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV DEBIAN_FRONTEND noninteractive
USER root

RUN apt-get update && apt-get -y install curl python3 groff less jq python3-pip && \
pip3 install --upgrade pip && \
pip3 install --upgrade awscli && \
pip3 install --break-system-packages --upgrade pip && \
pip3 install --break-system-packages --upgrade awscli && \
apt-get clean

# Install restic to take backups
Expand Down
6 changes: 3 additions & 3 deletions docker/postgresql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN useradd -r --gid=0 --uid=1001 postgres
RUN set -x \
&& apt-get update \
&& apt-get install -y curl groff lzop pv postgresql-client python3-pip daemontools \
&& pip3 install --upgrade pip \
&& pip3 install --break-system-packages --upgrade pip \
&& hash -r pip3 \
&& pip3 install wal-e[aws] \
&& pip3 install awscli
&& pip3 install --break-system-packages wal-e[aws] \
&& pip3 install --break-system-packages awscli

USER postgres
4 changes: 2 additions & 2 deletions examples/postgres-RDS/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ENV DEBIAN_FRONTEND noninteractive
USER root

RUN apt-get update && apt-get -y install curl python3-pip && \
pip3 install --upgrade pip && \
pip3 install --upgrade awscli && \
pip3 install --break-system-packages --upgrade pip && \
pip3 install --break-system-packages --upgrade awscli && \
apt-get clean

RUN curl https://raw.githubusercontent.com/kanisterio/kanister/master/scripts/get.sh | bash
Expand Down
1 change: 1 addition & 0 deletions pkg/app/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func NewMongoDB(name string) HelmApp {
RepoURL: helm.BitnamiRepoURL,
RepoName: helm.BitnamiRepoName,
Chart: "mongodb",
Version: "14.11.1",
Values: map[string]string{
"architecture": "replicaset",
"image.pullPolicy": "Always",
Expand Down

0 comments on commit c03d632

Please sign in to comment.