From c6a2cc11948b554be3bc235230e830a90ecf3d5f Mon Sep 17 00:00:00 2001
From: Tomas <tomas@adomavicius.com>
Date: Tue, 18 Jul 2023 22:35:51 +0300
Subject: [PATCH] bump appVersion to 1.2.3 restore OCI pushes to dockerhub
 alongside GHCR

---
 .github/workflows/release.yml           | 10 +++++++++-
 README.md                               | 16 ++++++----------
 charts/ext-postgres-operator/Chart.yaml |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3d5a6125c..edc9dc68b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,8 +16,16 @@ jobs:
           echo ${{ github.ref }} | cut -d '/' -f 3 > DOCKER_TAG
       - name: Build and push container image
         run: |
-          docker build --file build/Dockerfile.dist --tag ghcr.io/movetokube/postgres-operator:$(cat DOCKER_TAG) .
+          docker build --file build/Dockerfile.dist --tag ghcr.io/movetokube/postgres-operator:$(cat DOCKER_TAG) --tag movetokube/postgres-operator:$(cat DOCKER_TAG) .
           docker tag ghcr.io/movetokube/postgres-operator:$(cat DOCKER_TAG) ghcr.io/movetokube/postgres-operator:latest
+          docker tag movetokube/postgres-operator:$(cat DOCKER_TAG) movetokube/postgres-operator:latest
+         
           docker login ghcr.io --username USERNAME --password ${{ secrets.GITHUB_TOKEN }}
           docker push ghcr.io/movetokube/postgres-operator:$(cat DOCKER_TAG)
           docker push ghcr.io/movetokube/postgres-operator:latest
+          
+          docker login --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_TOKEN }}
+          docker push movetokube/postgres-operator:$(cat DOCKER_TAG)
+          docker push movetokube/postgres-operator:latest
+
+
diff --git a/README.md b/README.md
index 268b33991..d45c14d38 100644
--- a/README.md
+++ b/README.md
@@ -3,20 +3,16 @@
 ---------------------------------------------------------
 ### IMPORTANT UPDATE 
 
-### Deprecation of DockerHub repository `movetokube/postgres-operator`
+### Restoring pushes to DockerHub repository `movetokube/postgres-operator`
 
-Dockerhub decided to sunset free organisations in docker hub and gave a timeline of 4 weeks to either pay the monthly fee for organisation
-or move somewhere else. 
-Movetokube being an open source organisation (with me as a single member) in dockerhub cannot bear the requested price and is forced to move.
+Some history about this:
 
-`movetokube/postgres-operator` images will be deleted from docker hub, by docker hub in May and will no longer be available in there.
-All images with all tags have been migrated to Github Container Registry (GHCR.io). You will have to adjust your deployments to reflect that, or better: cache images 
-locally in your own organisations. 
+About 10 days after announcing the decition to sunset free organisations in dockerhub and receiving heavily negative community feedback
+Docker revoked their decision, did a 180-degree turn and did not sunset free legacy organisations.
 
-All future `postgres-operator` images will be published to `ghcr.io/movetokube/postgres-operator` repository. 
+Thus, new images of this operator will be pushed to both `movetokube/postgres-operator` and `ghcr.io/movetokube/postgres-operator` for your convenience.
 
-ext-postgres-operator Helm chart version **1.2.3** will automatically pull images
-from this new repository.
+Starting with ext-postgres-operator Helm chart version **1.2.3** images will be pulled from ghcr by default, you can change this if you like.
 
 Here's how to install it (please install with care according to your configuration):
 ```shell
diff --git a/charts/ext-postgres-operator/Chart.yaml b/charts/ext-postgres-operator/Chart.yaml
index ccb6303b8..790492e71 100644
--- a/charts/ext-postgres-operator/Chart.yaml
+++ b/charts/ext-postgres-operator/Chart.yaml
@@ -17,4 +17,4 @@ version: 1.2.3
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.2.1"
+appVersion: "1.2.3"