From b1eac4315bba775ccce0841beb35122992a5f347 Mon Sep 17 00:00:00 2001
From: Michael Burns <5170+mburns@users.noreply.github.com>
Date: Mon, 17 May 2021 01:59:47 +0000
Subject: [PATCH 1/4] Build a go-ipfs-extras docker image, includes peerlog

---
 .circleci/config.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f9fe22c4001..21a29d5718a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -335,6 +335,23 @@ jobs:
           root: .
           paths:
             - ./go-ipfs-image.tar
+  docker-build-extras:
+    executor: dockerizer
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: "19.03.13"
+      - run:
+          name: Build Docker Extras image
+          command: |
+          docker build --build-arg IPFS_PLUGINS="peerlog" -t "$IMAGE_NAME-extras:$WIP_IMAGE_TAG" .
+      - run:
+          name: Archive Docker Extras image
+          command: docker save -o go-ipfs-extras-image.tar $IMAGE_NAME
+      - persist_to_workspace:
+          root: .
+          paths:
+            - ./go-ipfs-extras-image.tar
   docker-push:
     executor: dockerizer
     steps:
@@ -351,6 +368,22 @@ jobs:
           command: |
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
             ./bin/push-docker-tags.sh $(date -u +%F) "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG"
+  docker-push-extras:
+    executor: dockerizer
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: "19.03.13"
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: Load archived Docker Extras image
+          command: docker load -i /tmp/workspace/go-ipfs-extras-image.tar
+      - run:
+          name: Publish Docker Extras Image to Docker Hub
+          command: |
+            echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+            ./bin/push-docker-tags.sh $(date -u +%F) "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG"
 
 workflows:
   version: 2

From 17ed9fbeb3bb116f191863f0ac318a54255d94a6 Mon Sep 17 00:00:00 2001
From: Michael Burns <5170+mburns@users.noreply.github.com>
Date: Mon, 17 May 2021 02:11:02 +0000
Subject: [PATCH 2/4] remove dht-stabalize specialcase for bifrost

---
 bin/push-docker-tags.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/push-docker-tags.sh b/bin/push-docker-tags.sh
index 464a0f8942b..f8a2d09fe17 100755
--- a/bin/push-docker-tags.sh
+++ b/bin/push-docker-tags.sh
@@ -67,10 +67,6 @@ elif [[ $GIT_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
   pushTag "latest"
   pushTag "release" # see: https://github.com/ipfs/go-ipfs/issues/3999#issuecomment-742228981
 
-elif [ "$GIT_BRANCH" = "feat/stabilize-dht" ]; then
-  pushTag "bifrost-${BUILD_NUM}-${GIT_SHA1_SHORT}"
-  pushTag "bifrost-latest"
-
 elif [ "$GIT_BRANCH" = "master" ]; then
   pushTag "master-${BUILD_NUM}-${GIT_SHA1_SHORT}"
   pushTag "master-latest"

From 2fee45a7745179133bbf8198e81b2c549fb51f97 Mon Sep 17 00:00:00 2001
From: Michael Burns <5170+mburns@users.noreply.github.com>
Date: Sun, 11 Jul 2021 07:08:37 +0000
Subject: [PATCH 3/4] set docker tag

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21a29d5718a..3e616e031fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -383,7 +383,7 @@ jobs:
           name: Publish Docker Extras Image to Docker Hub
           command: |
             echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-            ./bin/push-docker-tags.sh $(date -u +%F) "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG"
+            ./bin/push-docker-tags.sh $(date -u +%F) "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "extras"
 
 workflows:
   version: 2

From f439629a888c323c836042aed042a88d59312175 Mon Sep 17 00:00:00 2001
From: Michael Burns <5170+mburns@users.noreply.github.com>
Date: Sun, 11 Jul 2021 07:17:51 +0000
Subject: [PATCH 4/4] indent

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e616e031fe..0761018c7b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -344,7 +344,7 @@ jobs:
       - run:
           name: Build Docker Extras image
           command: |
-          docker build --build-arg IPFS_PLUGINS="peerlog" -t "$IMAGE_NAME-extras:$WIP_IMAGE_TAG" .
+            docker build --build-arg IPFS_PLUGINS="peerlog" -t "$IMAGE_NAME-extras:$WIP_IMAGE_TAG" .
       - run:
           name: Archive Docker Extras image
           command: docker save -o go-ipfs-extras-image.tar $IMAGE_NAME