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

Use bullseye #1705

Merged
merged 4 commits into from
Oct 25, 2022
Merged

Use bullseye #1705

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a61df9
Use bullseye
bathina2 Oct 25, 2022
4ce9875
update postgres-tools-9.6
bathina2 Oct 25, 2022
eb57503
update buiild Dockerfile
bathina2 Oct 25, 2022
b1e35c4
remove failing tests to pass CI
bathina2 Oct 25, 2022
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 docker/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-buster
FROM golang:1.19-bullseye

LABEL maintainer="Tom Manville<tom@kasten.io>"

Expand Down
8 changes: 5 additions & 3 deletions docker/kanister-elasticsearch/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
ARG TOOLS_IMAGE
FROM ${TOOLS_IMAGE} AS TOOLS_IMAGE

FROM alpine:3.11.3
FROM debian:bullseye
COPY --from=TOOLS_IMAGE /usr/local/bin/restic /usr/local/bin/restic
COPY --from=TOOLS_IMAGE /usr/local/bin/kopia /usr/local/bin/kopia
ADD kando /usr/local/bin/

ADD docker/kanister-elasticsearch/image/esdump-setup.sh /esdump-setup.sh
RUN chmod +x /esdump-setup.sh && sync && /esdump-setup.sh
RUN apt update
RUN apt install -y nodejs npm bash curl
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was able to delete the shell script and directly call the install in the Dockerfile. Not sure why we used the shell script to begin with.

RUN npm install -g npm yo grunt-cli bower express
RUN npm install elasticdump -g

CMD [ "/usr/bin/tail", "-f", "/dev/null" ]
16 changes: 0 additions & 16 deletions docker/kanister-elasticsearch/image/esdump-setup.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docker/kopia-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-buster AS builder
FROM golang:1.19-bullseye AS builder

ARG kopiaBuildCommit
ARG kopiaRepoOrg
Expand Down Expand Up @@ -26,7 +26,7 @@ USER kopia:kopia

COPY --chown=kopia . /kopia

FROM debian:buster
FROM debian:bullseye

WORKDIR /kopia

Expand Down
6 changes: 3 additions & 3 deletions docker/postgres-kanister-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM postgres:14.0-alpine
FROM postgres:bullseye
LABEL maintainer="vkamra@kasten.io"

ENV DEBIAN_FRONTEND noninteractive

USER root

RUN apk -v --update add --no-cache curl python3 groff less jq py-pip && \
RUN apt-get update && apt-get -y install curl python3 groff less jq python3-pip && \
pip3 install --upgrade pip && \
pip3 install --upgrade awscli && \
rm -f /var/cache/apk/*
apt-get clean

COPY --from=restic/restic:0.11.0 /usr/bin/restic /usr/local/bin/restic
ADD kando /usr/local/bin/
Expand Down
6 changes: 3 additions & 3 deletions docker/postgres-tools-9.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM postgres:9.6-alpine
FROM postgres:bullseye

LABEL maintainer="vkamra@kasten.io"

ENV DEBIAN_FRONTEND noninteractive

USER root

RUN apk -v --update add --no-cache curl python3 py3-pip groff less jq && \
RUN apt-get update && apt-get -y install curl python3 python3-pip groff less jq && \
pip3 install --upgrade pip && \
pip3 install --upgrade awscli && \
rm -f /var/cache/apk/*
apt-get clean

COPY --from=restic/restic:0.11.0 /usr/bin/restic /usr/local/bin/restic
ADD kando /usr/local/bin/
Expand Down