Skip to content

switch to ghcr base images in Dockerfiles #2970

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+15 −15
Open

switch to ghcr base images in Dockerfiles #2970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8cc99f1
switch to ghcr base images in Dockerfiles
FxKu Oct 24, 2025
ba9276e
fix base images
FxKu Oct 24, 2025
cf51fde
lets see if UI would work
FxKu Oct 24, 2025
ddce9a9
ok only change ui dockerfile
FxKu Oct 24, 2025
c87a676
trying again with base images from gh action
FxKu Oct 27, 2025
4f172ff
login to ghcr.io and build there
FxKu Oct 27, 2025
ef26219
lets try github action during PR
FxKu Oct 27, 2025
3573092
another revert
FxKu Oct 27, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/publish_ghcr_image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env:
IMAGE_NAME_UI: ${{ github.repository }}-ui

on:
pull_request:
push:
tags:
- '*'
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ docker: ${DOCKERDIR}/${DOCKERFILE}
echo "Version ${VERSION}"
echo "CDP tag ${CDP_TAG}"
echo "git describe $(shell git describe --tags --always --dirty)"
docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" .

indocker-race:
Expand Down
11 changes: 6 additions & 5 deletions delivery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ pipeline:
IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
if [[ ${CDP_TARGET_BRANCH} == "master" && ${IS_PR_BUILD} != "true" ]]
then
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator
IMAGE=ghcr.io/zalando/postgres-operator
else
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-test
IMAGE=ghcr.io/zalando/postgres-operator-test
fi
export IMAGE
make docker push
Expand All @@ -49,9 +49,9 @@ pipeline:
IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
if [[ ${CDP_TARGET_BRANCH} == "master" && ${IS_PR_BUILD} != "true" ]]
then
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-ui
IMAGE=ghcr.io/zalando/postgres-operator-ui
else
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-ui-test
IMAGE=ghcr.io/zalando/postgres-operator-ui-test
fi
export IMAGE
make docker
Expand All @@ -67,6 +67,7 @@ pipeline:
cmd: |
cd logical-backup
export TAG=$(git describe --tags --always --dirty)
IMAGE="registry-write.opensource.zalan.do/acid/logical-backup"
IMAGE="ghcr.io/zalando/logical-backup"
docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
docker build --rm -t "$IMAGE:$TAG$CDP_TAG" .
docker push "$IMAGE:$TAG$CDP_TAG"
16 changes: 6 additions & 10 deletions ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,14 @@ LABEL maintainer="Team ACID @ Zalando <[email protected]>"
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
Expand Down
1 change: 1 addition & 0 deletions ui/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ docker: appjs
echo "Version ${VERSION}"
echo "CDP tag ${CDP_TAG}"
echo "git describe $(shell git describe --tags --always --dirty)"
docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile .

push:
Expand Down
Loading