From 8cc99f1cc7bd66a97552564476397aecced6e47d Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 24 Oct 2025 11:42:49 +0200 Subject: [PATCH] switch to ghcr base images in Dockerfiles --- docker/Dockerfile | 2 +- logical-backup/Dockerfile | 2 +- ui/Dockerfile | 18 +++++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e50380003..1e7f4c2b2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3:latest +ARG BASE_IMAGE=ghcr.io/alpine-3:latest FROM golang:1.25-alpine AS builder ARG VERSION=latest diff --git a/logical-backup/Dockerfile b/logical-backup/Dockerfile index 137f4efa8..a84e2e6ef 100644 --- a/logical-backup/Dockerfile +++ b/logical-backup/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=registry.opensource.zalan.do/library/ubuntu-22.04:latest +ARG BASE_IMAGE=ghcr.io/ubuntu-22.04:latest FROM ${BASE_IMAGE} LABEL maintainer="Team ACID @ Zalando " diff --git a/ui/Dockerfile b/ui/Dockerfile index 51f1d7744..3e3197f0d 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=registry.opensource.zalan.do/library/python-3.11-slim:latest +ARG BASE_IMAGE=ghcr.io/python-3.11-slim:latest ARG NODE_IMAGE=node:lts-alpine FROM $NODE_IMAGE AS build @@ -15,18 +15,14 @@ LABEL maintainer="Team ACID @ Zalando " EXPOSE 8081 WORKDIR /app -RUN apt-get -qq -y update \ - # https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary - && apt-get -qq -y install --no-install-recommends g++ libpq-dev python3-dev python3-distutils \ - && apt-get -qq -y clean \ - && rm -rf /var/lib/apt/lists/* - -COPY requirements.txt . -COPY start_server.sh . -RUN pip install -r requirements.txt +COPY requirements.txt start_server.sh ./ +# Install dependencies for building psycopg2 from source as well +RUN dnf install libpq libpq-devel gcc -y \ + && pip install -r requirements.txt --no-cache-dir \ + && dnf remove libpq-devel gcc -y \ + && dnf clean all COPY operator_ui operator_ui/ -COPY --from=build /workdir/operator_ui/static/build/ operator_ui/static/build/ ARG VERSION=dev RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" operator_ui/__init__.py