From b4ce1bf2bd4830995c8bba9aa359b7df31903d41 Mon Sep 17 00:00:00 2001
From: SondreB <sondre@outlook.com>
Date: Tue, 17 Dec 2024 11:41:39 +0100
Subject: [PATCH] Update the docker build workflows (#12)

Merging this even if there is one unit test that fails. The code should not be touching this, so hopefully it will work when merged.
---
 .github/workflows/on-tag.yml        | 12 ++++++++----
 docker-angor-api/docker-compose.yml |  2 +-
 docker/docker-compose.yml           |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
index 634a27ab94..4c29fe883d 100644
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -64,8 +64,12 @@ jobs:
       - name: Add SHORT_SHA env property with commit short sha
         run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
 
-      - name: Login to Docker for building
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+ #     - name: Login to Docker for building
+ #       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+      - name: Login to Docker
+        run: |
+          docker login -u "sondreb" -p "${{secrets.DOCKER_KEY}}"
 
       - name: Checkout project
         uses: actions/checkout@v4
@@ -99,8 +103,8 @@ jobs:
           --cache-from "type=local,src=/tmp/.buildx-cache" \
           --cache-to "type=local,dest=/tmp/.buildx-cache" \
           --platform linux/amd64,linux/arm64 \
-          --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
-          --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
+          --tag blockcore/mempool-${{ matrix.service }}:$TAG \
+          --tag blockcore/mempool-${{ matrix.service }}:latest \
           --build-context rustgbt=./rust \
           --build-context backend=./backend \
           --output "type=registry" ./${{ matrix.service }}/ \
diff --git a/docker-angor-api/docker-compose.yml b/docker-angor-api/docker-compose.yml
index e821831231..d3f79bc700 100644
--- a/docker-angor-api/docker-compose.yml
+++ b/docker-angor-api/docker-compose.yml
@@ -117,7 +117,7 @@ services:
       LETSENCRYPT_HOST: explorer.angor.io
       LETSENCRYPT_EMAIL: admin@blockcore.net
       ASPNETCORE_URLS: http://+:8080
-    image: mempool/frontend:latest
+    image: blockcore/mempool-frontend:latest
     user: "0:1000"
     restart: always
     stop_grace_period: 1m
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4e1094306f..93d70d48d5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     environment:
       FRONTEND_HTTP_PORT: "8080"
       BACKEND_MAINNET_HTTP_HOST: "api"
-    image: mempool/frontend:latest
+    image: blockcore/mempool-frontend:latest
     user: "1000:1000"
     restart: on-failure
     stop_grace_period: 1m
@@ -25,7 +25,7 @@ services:
       DATABASE_USERNAME: "mempool"
       DATABASE_PASSWORD: "mempool"
       STATISTICS_ENABLED: "true"
-    image: mempool/backend:latest
+    image: blockcore/mempool-backend:latest
     user: "1000:1000"
     restart: on-failure
     stop_grace_period: 1m