From 2763d3fbfa52b255eb21b261f43a3b4edc08bfd2 Mon Sep 17 00:00:00 2001
From: zakir <80246097+zakir-code@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:47:22 +0800
Subject: [PATCH] chore: downgrade cosmovisor to v1.6.0

---
 .github/workflows/docker.yml | 8 +++++---
 Dockerfile.cosmovisor        | 8 +++++---
 Dockerfile.cosmovisor-lite   | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 62fa87cb..8671dbec 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -46,13 +46,14 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name == 'push' }}
           platforms: linux/amd64, linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
 
   cosmovisor-lite:
     runs-on: ubuntu-latest
     needs: fxcore
+    if: github.event_name == 'push'
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -82,13 +83,14 @@ jobs:
         with:
           context: .
           file: ./Dockerfile.cosmovisor-lite
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           platforms: linux/amd64, linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
 
   cosmovisor:
     runs-on: ubuntu-latest
     needs: fxcore
+    if: github.event_name == 'push'
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -118,6 +120,6 @@ jobs:
         with:
           context: .
           file: ./Dockerfile.cosmovisor
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           platforms: linux/amd64, linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile.cosmovisor b/Dockerfile.cosmovisor
index dab5d400..00857bbb 100644
--- a/Dockerfile.cosmovisor
+++ b/Dockerfile.cosmovisor
@@ -1,12 +1,13 @@
 FROM ghcr.io/pundiai/fxcorevisor:7.5.1 AS fxv7_5
-FROM ghcr.io/pundiai/fx-core:8.0.1-rc0 AS fxv8
+FROM ghcr.io/pundiai/fx-core:8.0.0-rc0 AS fxv8
+FROM ghcr.io/pundiai/fx-core:8.1.0-rc1 AS fxv8_1
 FROM --platform=$BUILDPLATFORM alpine:3.19 AS downloader
 
 ARG TARGETPLATFORM
 
 RUN ARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) && \
-    wget -c https://github.com/cosmos/cosmos-sdk/releases/download/cosmovisor%2Fv1.7.0/cosmovisor-v1.7.0-linux-$ARCH.tar.gz && \
-    tar -zxvf cosmovisor-v1.7.0-linux-$ARCH.tar.gz
+    wget -c https://github.com/cosmos/cosmos-sdk/releases/download/cosmovisor%2Fv1.6.0/cosmovisor-v1.6.0-linux-$ARCH.tar.gz && \
+    tar -zxvf cosmovisor-v1.6.0-linux-$ARCH.tar.gz
 
 FROM alpine:3.19
 
@@ -29,6 +30,7 @@ ENV PATH="/root/.fxcore/cosmovisor/current/bin:${PATH}"
 COPY --from=fxv7_5 /root/.fxcore/cosmovisor /root/.fxcore/cosmovisor
 
 COPY --from=fxv8 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v8.0.x/bin/fxcored
+COPY --from=fxv8_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v8.1.x/bin/fxcored
 
 COPY --from=downloader /cosmovisor /usr/bin/cosmovisor
 
diff --git a/Dockerfile.cosmovisor-lite b/Dockerfile.cosmovisor-lite
index 6f851b64..b9169794 100644
--- a/Dockerfile.cosmovisor-lite
+++ b/Dockerfile.cosmovisor-lite
@@ -1,12 +1,13 @@
 FROM ghcr.io/pundiai/fx-core:7.5.1 AS fxv7_5
-FROM ghcr.io/pundiai/fx-core:8.0.1-rc0 AS fxv8
+FROM ghcr.io/pundiai/fx-core:8.0.0-rc0 AS fxv8
+FROM ghcr.io/pundiai/fx-core:8.1.0-rc1 AS fxv8_1
 FROM --platform=$BUILDPLATFORM alpine:3.19 AS downloader
 
 ARG TARGETPLATFORM
 
 RUN ARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) && \
-    wget -c https://github.com/cosmos/cosmos-sdk/releases/download/cosmovisor%2Fv1.7.0/cosmovisor-v1.7.0-linux-$ARCH.tar.gz && \
-    tar -zxvf cosmovisor-v1.7.0-linux-$ARCH.tar.gz
+    wget -c https://github.com/cosmos/cosmos-sdk/releases/download/cosmovisor%2Fv1.6.0/cosmovisor-v1.6.0-linux-$ARCH.tar.gz && \
+    tar -zxvf cosmovisor-v1.6.0-linux-$ARCH.tar.gz
 
 FROM alpine:3.19
 
@@ -31,6 +32,7 @@ RUN mkdir -p /root/.fxcore/cosmovisor/upgrades/v7.5.x/bin && \
     ln -s /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.5.x/bin/fxcored
 
 COPY --from=fxv8 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v8.0.x/bin/fxcored
+COPY --from=fxv8_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v8.1.x/bin/fxcored
 
 COPY --from=downloader /cosmovisor /usr/bin/cosmovisor