Skip to content

Commit

Permalink
update to Debian 12 and latest of all tools
Browse files Browse the repository at this point in the history
  • Loading branch information
jshimko committed Nov 20, 2023
1 parent 98d7ce3 commit 9bc92ca
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USER }}
Expand All @@ -35,6 +34,5 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
22 changes: 13 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
FROM debian:11-slim
FROM debian:12-slim

ENV DEBIAN_FRONTEND=noninteractive

RUN apt update && \
apt upgrade -y && \
apt install -y --no-install-recommends curl git gnupg2 python python3-pip vim wget && \
echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
apt -y update && apt install -y --no-install-recommends postgresql-client-14 && \
rm -rf /var/lib/apt/lists/* && \
pip3 install --upgrade pip && \
pip3 install awscli yamllint yq
apt install -y --no-install-recommends \
curl ca-certificates git gnupg2 python3 pipx vim wget && \
install -d /usr/share/postgresql-common/pgdg && \
curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" \
> /etc/apt/sources.list.d/pgdg.list && \
apt update && apt install -y --no-install-recommends postgresql-client-16 && \
rm -rf /var/lib/apt/lists/*

RUN pipx install awscli
RUN pipx install yamllint

# kubectl
RUN curl -LO "https://dl.k8s.io/release/$(curl -Ls https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
Expand All @@ -32,7 +36,7 @@ RUN curl https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/downl
aws-iam-authenticator help

# Digital Ocean CLI (doctl)
RUN DOCTL_VERSION=1.92.0 && \
RUN DOCTL_VERSION=1.100.0 && \
wget https://github.com/digitalocean/doctl/releases/download/v${DOCTL_VERSION}/doctl-${DOCTL_VERSION}-linux-amd64.tar.gz && \
tar xf ./doctl-${DOCTL_VERSION}-linux-amd64.tar.gz && \
mv ./doctl /usr/local/bin && \
Expand Down

0 comments on commit 9bc92ca

Please sign in to comment.