Compare commits

..

No commits in common. "4f172ff6cb4bf9d11b977a4549f7a9de200fa8dd" and "ddce9a98a2a893bdc18a9a4fdd9d56bd28b471cb" have entirely different histories.

6 changed files with 8 additions and 11 deletions

View File

@ -66,7 +66,6 @@ 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:

View File

@ -20,9 +20,9 @@ pipeline:
IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
if [[ ${CDP_TARGET_BRANCH} == "master" && ${IS_PR_BUILD} != "true" ]]
then
IMAGE=ghcr.io/zalando/postgres-operator
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator
else
IMAGE=ghcr.io/zalando/postgres-operator-test
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-test
fi
export IMAGE
make docker push
@ -49,9 +49,9 @@ pipeline:
IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
if [[ ${CDP_TARGET_BRANCH} == "master" && ${IS_PR_BUILD} != "true" ]]
then
IMAGE=ghcr.io/zalando/postgres-operator-ui
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-ui
else
IMAGE=ghcr.io/zalando/postgres-operator-ui-test
IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-ui-test
fi
export IMAGE
make docker
@ -67,7 +67,6 @@ pipeline:
cmd: |
cd logical-backup
export TAG=$(git describe --tags --always --dirty)
IMAGE="ghcr.io/zalando/logical-backup"
docker login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
IMAGE="registry-write.opensource.zalan.do/acid/logical-backup"
docker build --rm -t "$IMAGE:$TAG$CDP_TAG" .
docker push "$IMAGE:$TAG$CDP_TAG"

View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine-3
ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3:latest
FROM golang:1.25-alpine AS builder
ARG VERSION=latest

View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=ubuntu-22.04
ARG BASE_IMAGE=registry.opensource.zalan.do/library/ubuntu-22.04:latest
FROM ${BASE_IMAGE}
LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"

View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=python-3.11-slim
ARG BASE_IMAGE=registry.opensource.zalan.do/library/python-3.11-slim:latest
ARG NODE_IMAGE=node:lts-alpine
FROM $NODE_IMAGE AS build

View File

@ -30,7 +30,6 @@ 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: