diff --git a/.github/workflows/fxcorevisor-docker-v1.yml b/.github/workflows/fxcorevisor-docker-v1.yml deleted file mode 100644 index 519cbb6e188f..000000000000 --- a/.github/workflows/fxcorevisor-docker-v1.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build and Push Fxcorevisor image - -on: - push: - tags: - - "fxcorevisor/v1.*.*" - -jobs: - push_to_registries: - name: Push Docker image to ghcr - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Get Github tag - id: meta - run: | - echo "TAG=$(git describe --always --tags --match='fxcorevisor/v*'|awk '{split($1, arr, "/"); print arr[2]}' | sed -e 's/^v//')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push images - uses: docker/build-push-action@v3 - with: - context: . - file: ./tools/cosmovisor/Dockerfile_v1 - push: true - platforms: linux/amd64, linux/arm64 - tags: | - ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} \ No newline at end of file diff --git a/.github/workflows/fxcorevisor-docker-v2.yml b/.github/workflows/fxcorevisor-docker-v2.yml deleted file mode 100644 index 99e889acc232..000000000000 --- a/.github/workflows/fxcorevisor-docker-v2.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build and Push Fxcorevisor image - -on: - push: - tags: - - "fxcorevisor/v2.*.*" - -jobs: - push_to_registries: - name: Push Docker image to ghcr - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Get Github tag - id: meta - run: | - echo "TAG=$(git describe --always --tags --match='fxcorevisor/v*'|awk '{split($1, arr, "/"); print arr[2]}' | sed -e 's/^v//')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push images - uses: docker/build-push-action@v3 - with: - context: . - file: ./tools/cosmovisor/Dockerfile_v2 - push: true - platforms: linux/amd64, linux/arm64 - tags: | - ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} \ No newline at end of file diff --git a/.github/workflows/fxcorevisor-docker-v3.yml b/.github/workflows/fxcorevisor-docker-v3.yml deleted file mode 100644 index f3113795618f..000000000000 --- a/.github/workflows/fxcorevisor-docker-v3.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build and Push Fxcorevisor image - -on: - push: - tags: - - "fxcorevisor/v3.*.*" - -jobs: - push_to_registries: - name: Push Docker image to ghcr - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Get Github tag - id: meta - run: | - echo "TAG=$(git describe --always --tags --match='fxcorevisor/v*'|awk '{split($1, arr, "/"); print arr[2]}' | sed -e 's/^v//')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push images - uses: docker/build-push-action@v3 - with: - context: . - file: ./tools/cosmovisor/Dockerfile_v3 - push: true - platforms: linux/amd64, linux/arm64 - tags: | - ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} \ No newline at end of file diff --git a/.github/workflows/fxcorevisor-docker-v4.yml b/.github/workflows/fxcorevisor-docker-v4.yml deleted file mode 100644 index b6b0824089d2..000000000000 --- a/.github/workflows/fxcorevisor-docker-v4.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build and Push Fxcorevisor image - -on: - push: - tags: - - "fxcorevisor/v4.*.*" - -jobs: - push_to_registries: - name: Push Docker image to ghcr - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Get Github tag - id: meta - run: | - echo "TAG=$(git describe --always --tags --match='fxcorevisor/v*'|awk '{split($1, arr, "/"); print arr[2]}' | sed -e 's/^v//')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push images - uses: docker/build-push-action@v3 - with: - context: . - file: ./tools/cosmovisor/Dockerfile_v4 - push: true - platforms: linux/amd64, linux/arm64 - tags: | - ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} \ No newline at end of file diff --git a/.github/workflows/fxcorevisor-docker-v5.yml b/.github/workflows/fxcorevisor-docker-v5.yml deleted file mode 100644 index ce910944cc37..000000000000 --- a/.github/workflows/fxcorevisor-docker-v5.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build and Push Fxcorevisor image - -on: - push: - tags: - - "fxcorevisor/v5.*.*" - -jobs: - push_to_registries: - name: Push Docker image to ghcr - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Get Github tag - id: meta - run: | - echo "TAG=$(git describe --always --tags --match='fxcorevisor/v*'|awk '{split($1, arr, "/"); print arr[2]}' | sed -e 's/^v//')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push images - uses: docker/build-push-action@v3 - with: - context: . - file: ./tools/cosmovisor/Dockerfile_v5 - push: true - platforms: linux/amd64, linux/arm64 - tags: | - ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} \ No newline at end of file diff --git a/.github/workflows/fxcorevisor-docker-v6.yml b/.github/workflows/fxcorevisor-docker-v6.yml deleted file mode 100644 index 49d77715b347..000000000000 --- a/.github/workflows/fxcorevisor-docker-v6.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Build and Push Fxcorevisor image - -on: - push: - tags: - - "fxcorevisor/v6.*.*" - -jobs: - push_to_registries: - name: Push Docker image to ghcr - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - steps: - - name: Check out the repo - uses: actions/checkout@v3 - - - name: Get Github tag - id: meta - run: | - echo "TAG=$(git describe --always --tags --match='fxcorevisor/v*'|awk '{split($1, arr, "/"); print arr[2]}' | sed -e 's/^v//')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push images - uses: docker/build-push-action@v3 - with: - context: . - file: ./tools/cosmovisor/Dockerfile_v6 - push: true - platforms: linux/amd64, linux/arm64 - tags: | - ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} \ No newline at end of file diff --git a/.github/workflows/fxcorevisor-docker-v7.yml b/.github/workflows/fxcorevisor-docker.yml similarity index 73% rename from .github/workflows/fxcorevisor-docker-v7.yml rename to .github/workflows/fxcorevisor-docker.yml index 802d2558c836..a44ec73f9e73 100644 --- a/.github/workflows/fxcorevisor-docker-v7.yml +++ b/.github/workflows/fxcorevisor-docker.yml @@ -3,7 +3,7 @@ name: Build and Push Fxcorevisor image on: push: tags: - - "fxcorevisor/v7.*.*" + - "fxcorevisor/v*.*.*" jobs: push_to_registries: @@ -38,8 +38,18 @@ jobs: uses: docker/build-push-action@v3 with: context: . - file: ./tools/cosmovisor/Dockerfile_v7 + file: ./tools/cosmovisor/Dockerfile push: true platforms: linux/amd64, linux/arm64 tags: | ghcr.io/functionx/fxcorevisor:${{ steps.meta.outputs.TAG }} + + - name: Build and push lite images + uses: docker/build-push-action@v3 + with: + context: . + file: ./tools/cosmovisor/Dockerfile_lite + push: true + platforms: linux/amd64, linux/arm64 + tags: | + ghcr.io/functionx/fxcorevisor-lite:${{ steps.meta.outputs.TAG }} diff --git a/tools/cosmovisor/Dockerfile_v7 b/tools/cosmovisor/Dockerfile similarity index 90% rename from tools/cosmovisor/Dockerfile_v7 rename to tools/cosmovisor/Dockerfile index 6075e8d9683d..cc370d592f07 100644 --- a/tools/cosmovisor/Dockerfile_v7 +++ b/tools/cosmovisor/Dockerfile @@ -18,6 +18,7 @@ FROM functionx/fx-core:4.2.2 as fxv4_2 FROM functionx/fx-core:5.0.0 as fxv5 FROM functionx/fx-core:6.0.0 as fxv6 FROM functionx/fx-core:7.0.1-rc0 as fxv7 +FROM functionx/fx-core:7.1.0-rc1 as fxv7_1 # build fxcorevisor FROM alpine:3.18 @@ -49,7 +50,8 @@ RUN mkdir -p /cosmovisor/binary/genesis/bin && \ mkdir -p /cosmovisor/binary/upgrades/v4.2.x/bin && \ mkdir -p /cosmovisor/binary/upgrades/v5.0.x/bin && \ mkdir -p /cosmovisor/binary/upgrades/v6.0.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v7.0.x/bin + mkdir -p /cosmovisor/binary/upgrades/v7.0.x/bin && \ + mkdir -p /cosmovisor/binary/upgrades/v7.1.x/bin COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv2 /cosmovisor/upgrades-info COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv3 /cosmovisor/upgrades-info @@ -59,6 +61,7 @@ COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.2.x /cosmovisor/upgra COPY --from=builder /app/tools/cosmovisor/upgrades-info/v5.0.x /cosmovisor/upgrades-info COPY --from=builder /app/tools/cosmovisor/upgrades-info/v6.0.x /cosmovisor/upgrades-info COPY --from=builder /app/tools/cosmovisor/upgrades-info/v7.0.x /cosmovisor/upgrades-info +COPY --from=builder /app/tools/cosmovisor/upgrades-info/v7.1.x /cosmovisor/upgrades-info COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin COPY --from=fxv2 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv2/bin @@ -69,6 +72,7 @@ COPY --from=fxv4_2 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.2.x/bin COPY --from=fxv5 /usr/bin/fxcored /cosmovisor/binary/upgrades/v5.0.x/bin COPY --from=fxv6 /usr/bin/fxcored /cosmovisor/binary/upgrades/v6.0.x/bin COPY --from=fxv7 /usr/bin/fxcored /cosmovisor/binary/upgrades/v7.0.x/bin +COPY --from=fxv7_1 /usr/bin/fxcored /cosmovisor/binary/upgrades/v7.1.x/bin COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor diff --git a/tools/cosmovisor/Dockerfile_v3 b/tools/cosmovisor/Dockerfile_lite similarity index 56% rename from tools/cosmovisor/Dockerfile_v3 rename to tools/cosmovisor/Dockerfile_lite index 33d2dafb2470..aa0d2d687189 100644 --- a/tools/cosmovisor/Dockerfile_v3 +++ b/tools/cosmovisor/Dockerfile_lite @@ -1,5 +1,5 @@ # compile cosmovisor -FROM golang:1.18.2-alpine3.16 as builder +FROM golang:1.21.4-alpine3.18 as builder RUN apk add --no-cache git build-base linux-headers @@ -9,14 +9,12 @@ COPY . . RUN go env -w GO111MODULE=on && cd /app/tools/cosmovisor && go mod download && make cosmovisor -FROM functionx/fx-core:1.1.2 as fxv1 - -FROM functionx/fx-core:2.4.2 as fxv2 - -FROM functionx/fx-core:3.1.0 as fxv3 +FROM functionx/fx-core:6.0.0 as fxv6 +FROM functionx/fx-core:7.0.1-rc0 as fxv7 +FROM functionx/fx-core:7.1.0-rc1 as fxv7_1 # build fxcorevisor -FROM alpine:3.16 +FROM alpine:3.18 WORKDIR root @@ -38,15 +36,15 @@ ENV DAEMON_BINARY_PATH=/cosmovisor/binary ENV DAEMON_UPGRADES_INFO_PATH=/cosmovisor/upgrades-info RUN mkdir -p /cosmovisor/binary/genesis/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv2/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv3/bin + mkdir -p /cosmovisor/binary/upgrades/v7.0.x/bin && \ + mkdir -p /cosmovisor/binary/upgrades/v7.1.x/bin -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv2 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv3 /cosmovisor/upgrades-info +COPY --from=builder /app/tools/cosmovisor/upgrades-info/v7.0.x /cosmovisor/upgrades-info +COPY --from=builder /app/tools/cosmovisor/upgrades-info/v7.1.x /cosmovisor/upgrades-info -COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin -COPY --from=fxv2 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv2/bin -COPY --from=fxv3 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv3/bin +COPY --from=fxv6 /usr/bin/fxcored /cosmovisor/binary/genesis/bin +COPY --from=fxv7 /usr/bin/fxcored /cosmovisor/binary/upgrades/v7.0.x/bin +COPY --from=fxv7_1 /usr/bin/fxcored /cosmovisor/binary/upgrades/v7.1.x/bin COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor @@ -54,4 +52,4 @@ EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp VOLUME ["/root"] -ENTRYPOINT ["cosmovisor"] \ No newline at end of file +ENTRYPOINT ["cosmovisor"] diff --git a/tools/cosmovisor/Dockerfile_v1 b/tools/cosmovisor/Dockerfile_v1 deleted file mode 100644 index 7fc011ff6790..000000000000 --- a/tools/cosmovisor/Dockerfile_v1 +++ /dev/null @@ -1,47 +0,0 @@ -# compile cosmovisor -FROM golang:1.18.2-alpine3.16 as builder - -RUN apk add --no-cache git build-base linux-headers - -WORKDIR /app - -COPY . . - -RUN go env -w GO111MODULE=on && cd /app/tools/cosmovisor && go mod download && make cosmovisor - -FROM functionx/fx-core:1.1.2 as fxv1 - -# build fxcorevisor -FROM alpine:3.16 - -WORKDIR root - -ENV DAEMON_HOME=/root/.fxcore -ENV DAEMON_NAME=fxcored - -# optional -ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=false -ENV DAEMON_RESTART_AFTER_UPGRADE=true -ENV DAEMON_RESTART_DELAY=1s -ENV DAEMON_POLL_INTERVAL=3s -ENV DAEMON_DATA_BACKUP_DIR=/root/.fxcore -ENV UNSAFE_SKIP_BACKUP=true -ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 - -ENV DAEMON_CHOOSE_VERSION=true -ENV DAEMON_COSMOVISOR_REPLACE=true -ENV DAEMON_BINARY_PATH=/cosmovisor/binary -ENV DAEMON_UPGRADES_INFO_PATH=/cosmovisor/upgrades-info - -RUN mkdir -p /cosmovisor/binary/genesis/bin && \ - mkdir -p /cosmovisor/upgrades-info/fxcore/upgrades && \ - mkdir -p /cosmovisor/upgrades-info/dhobyghaut/upgrades - -COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin/fxcored -COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor - -EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp - -VOLUME ["/root"] - -ENTRYPOINT ["cosmovisor"] \ No newline at end of file diff --git a/tools/cosmovisor/Dockerfile_v2 b/tools/cosmovisor/Dockerfile_v2 deleted file mode 100644 index 496de36f290f..000000000000 --- a/tools/cosmovisor/Dockerfile_v2 +++ /dev/null @@ -1,51 +0,0 @@ -# compile cosmovisor -FROM golang:1.18.2-alpine3.16 as builder - -RUN apk add --no-cache git build-base linux-headers - -WORKDIR /app - -COPY . . - -RUN go env -w GO111MODULE=on && cd /app/tools/cosmovisor && go mod download && make cosmovisor - -FROM functionx/fx-core:1.1.2 as fxv1 - -FROM functionx/fx-core:2.4.2 as fxv2 - -# build fxcorevisor -FROM alpine:3.16 - -WORKDIR root - -ENV DAEMON_HOME=/root/.fxcore -ENV DAEMON_NAME=fxcored - -# optional -ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=false -ENV DAEMON_RESTART_AFTER_UPGRADE=true -ENV DAEMON_RESTART_DELAY=1s -ENV DAEMON_POLL_INTERVAL=3s -ENV DAEMON_DATA_BACKUP_DIR=/root/.fxcore -ENV UNSAFE_SKIP_BACKUP=true -ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 - -ENV DAEMON_CHOOSE_VERSION=true -ENV DAEMON_COSMOVISOR_REPLACE=true -ENV DAEMON_BINARY_PATH=/cosmovisor/binary -ENV DAEMON_UPGRADES_INFO_PATH=/cosmovisor/upgrades-info - -RUN mkdir -p /cosmovisor/binary/genesis/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv2/bin - -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv2 /cosmovisor/upgrades-info - -COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin/fxcored -COPY --from=fxv2 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv2/bin -COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor - -EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp - -VOLUME ["/root"] - -ENTRYPOINT ["cosmovisor"] \ No newline at end of file diff --git a/tools/cosmovisor/Dockerfile_v4 b/tools/cosmovisor/Dockerfile_v4 deleted file mode 100644 index b546af4208f2..000000000000 --- a/tools/cosmovisor/Dockerfile_v4 +++ /dev/null @@ -1,67 +0,0 @@ -# compile cosmovisor -FROM golang:1.18.2-alpine3.16 as builder - -RUN apk add --no-cache git build-base linux-headers - -WORKDIR /app - -COPY . . - -RUN go env -w GO111MODULE=on && cd /app/tools/cosmovisor && go mod download && make cosmovisor - -FROM functionx/fx-core:1.1.2 as fxv1 -FROM functionx/fx-core:2.4.2 as fxv2 -FROM functionx/fx-core:3.1.0 as fxv3 -FROM functionx/fx-core:4.0.0-rc1 as fxv4 -FROM functionx/fx-core:4.1.0-rc0 as fxv4_1 -FROM functionx/fx-core:4.2.2 as fxv4_2 - -# build fxcorevisor -FROM alpine:3.16 - -WORKDIR root - -ENV DAEMON_HOME=/root/.fxcore -ENV DAEMON_NAME=fxcored - -# optional -ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=false -ENV DAEMON_RESTART_AFTER_UPGRADE=true -ENV DAEMON_RESTART_DELAY=1s -ENV DAEMON_POLL_INTERVAL=3s -ENV DAEMON_DATA_BACKUP_DIR=/root/.fxcore -ENV UNSAFE_SKIP_BACKUP=true -ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 - -ENV DAEMON_CHOOSE_VERSION=true -ENV DAEMON_COSMOVISOR_REPLACE=true -ENV DAEMON_BINARY_PATH=/cosmovisor/binary -ENV DAEMON_UPGRADES_INFO_PATH=/cosmovisor/upgrades-info - -RUN mkdir -p /cosmovisor/binary/genesis/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv2/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv3/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv4/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v4.1.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v4.2.x/bin - -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv2 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv3 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv4 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.1.x /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.2.x /cosmovisor/upgrades-info - -COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin -COPY --from=fxv2 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv2/bin -COPY --from=fxv3 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv3/bin -COPY --from=fxv4 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv4/bin -COPY --from=fxv4_1 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.1.x/bin -COPY --from=fxv4_2 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.2.x/bin - -COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor - -EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp - -VOLUME ["/root"] - -ENTRYPOINT ["cosmovisor"] \ No newline at end of file diff --git a/tools/cosmovisor/Dockerfile_v5 b/tools/cosmovisor/Dockerfile_v5 deleted file mode 100644 index b98ec9823bbf..000000000000 --- a/tools/cosmovisor/Dockerfile_v5 +++ /dev/null @@ -1,71 +0,0 @@ -# compile cosmovisor -FROM golang:1.18.2-alpine3.16 as builder - -RUN apk add --no-cache git build-base linux-headers - -WORKDIR /app - -COPY . . - -RUN go env -w GO111MODULE=on && cd /app/tools/cosmovisor && go mod download && make cosmovisor - -FROM functionx/fx-core:1.1.2 as fxv1 -FROM functionx/fx-core:2.4.2 as fxv2 -FROM functionx/fx-core:3.1.0 as fxv3 -FROM functionx/fx-core:4.0.0-rc1 as fxv4 -FROM functionx/fx-core:4.1.0-rc0 as fxv4_1 -FROM functionx/fx-core:4.2.2 as fxv4_2 -FROM functionx/fx-core:5.0.0 as fxv5 - -# build fxcorevisor -FROM alpine:3.16 - -WORKDIR root - -ENV DAEMON_HOME=/root/.fxcore -ENV DAEMON_NAME=fxcored - -# optional -ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=false -ENV DAEMON_RESTART_AFTER_UPGRADE=true -ENV DAEMON_RESTART_DELAY=1s -ENV DAEMON_POLL_INTERVAL=3s -ENV DAEMON_DATA_BACKUP_DIR=/root/.fxcore -ENV UNSAFE_SKIP_BACKUP=true -ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 - -ENV DAEMON_CHOOSE_VERSION=true -ENV DAEMON_COSMOVISOR_REPLACE=true -ENV DAEMON_BINARY_PATH=/cosmovisor/binary -ENV DAEMON_UPGRADES_INFO_PATH=/cosmovisor/upgrades-info - -RUN mkdir -p /cosmovisor/binary/genesis/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv2/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv3/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv4/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v4.1.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v4.2.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v5.0.x/bin - -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv2 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv3 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv4 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.1.x /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.2.x /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v5.0.x /cosmovisor/upgrades-info - -COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin -COPY --from=fxv2 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv2/bin -COPY --from=fxv3 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv3/bin -COPY --from=fxv4 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv4/bin -COPY --from=fxv4_1 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.1.x/bin -COPY --from=fxv4_2 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.2.x/bin -COPY --from=fxv5 /usr/bin/fxcored /cosmovisor/binary/upgrades/v5.0.x/bin - -COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor - -EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp - -VOLUME ["/root"] - -ENTRYPOINT ["cosmovisor"] \ No newline at end of file diff --git a/tools/cosmovisor/Dockerfile_v6 b/tools/cosmovisor/Dockerfile_v6 deleted file mode 100644 index 81b760d8b4a8..000000000000 --- a/tools/cosmovisor/Dockerfile_v6 +++ /dev/null @@ -1,75 +0,0 @@ -# compile cosmovisor -FROM golang:1.21.4-alpine3.18 as builder - -RUN apk add --no-cache git build-base linux-headers - -WORKDIR /app - -COPY . . - -RUN go env -w GO111MODULE=on && cd /app/tools/cosmovisor && go mod download && make cosmovisor - -FROM functionx/fx-core:1.1.2 as fxv1 -FROM functionx/fx-core:2.4.2 as fxv2 -FROM functionx/fx-core:3.1.0 as fxv3 -FROM functionx/fx-core:4.0.0-rc1 as fxv4 -FROM functionx/fx-core:4.1.0-rc0 as fxv4_1 -FROM functionx/fx-core:4.2.2 as fxv4_2 -FROM functionx/fx-core:5.0.0 as fxv5 -FROM functionx/fx-core:6.0.0 as fxv6 - -# build fxcorevisor -FROM alpine:3.18 - -WORKDIR root - -ENV DAEMON_HOME=/root/.fxcore -ENV DAEMON_NAME=fxcored - -# optional -ENV DAEMON_ALLOW_DOWNLOAD_BINARIES=false -ENV DAEMON_RESTART_AFTER_UPGRADE=true -ENV DAEMON_RESTART_DELAY=1s -ENV DAEMON_POLL_INTERVAL=3s -ENV DAEMON_DATA_BACKUP_DIR=/root/.fxcore -ENV UNSAFE_SKIP_BACKUP=true -ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 - -ENV DAEMON_CHOOSE_VERSION=true -ENV DAEMON_COSMOVISOR_REPLACE=true -ENV DAEMON_BINARY_PATH=/cosmovisor/binary -ENV DAEMON_UPGRADES_INFO_PATH=/cosmovisor/upgrades-info - -RUN mkdir -p /cosmovisor/binary/genesis/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv2/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv3/bin && \ - mkdir -p /cosmovisor/binary/upgrades/fxv4/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v4.1.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v4.2.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v5.0.x/bin && \ - mkdir -p /cosmovisor/binary/upgrades/v6.0.x/bin - -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv2 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv3 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/fxv4 /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.1.x /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v4.2.x /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v5.0.x /cosmovisor/upgrades-info -COPY --from=builder /app/tools/cosmovisor/upgrades-info/v6.0.x /cosmovisor/upgrades-info - -COPY --from=fxv1 /usr/bin/fxcored /cosmovisor/binary/genesis/bin -COPY --from=fxv2 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv2/bin -COPY --from=fxv3 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv3/bin -COPY --from=fxv4 /usr/bin/fxcored /cosmovisor/binary/upgrades/fxv4/bin -COPY --from=fxv4_1 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.1.x/bin -COPY --from=fxv4_2 /usr/bin/fxcored /cosmovisor/binary/upgrades/v4.2.x/bin -COPY --from=fxv5 /usr/bin/fxcored /cosmovisor/binary/upgrades/v5.0.x/bin -COPY --from=fxv6 /usr/bin/fxcored /cosmovisor/binary/upgrades/v6.0.x/bin - -COPY --from=builder /app/tools/cosmovisor/cosmovisor /usr/bin/cosmovisor - -EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp - -VOLUME ["/root"] - -ENTRYPOINT ["cosmovisor"] \ No newline at end of file diff --git a/tools/cosmovisor/upgrades-info/v7.1.x/dhobyghaut/upgrades/v7.1.x/upgrade-info.json b/tools/cosmovisor/upgrades-info/v7.1.x/dhobyghaut/upgrades/v7.1.x/upgrade-info.json new file mode 100644 index 000000000000..f3a55eb0098b --- /dev/null +++ b/tools/cosmovisor/upgrades-info/v7.1.x/dhobyghaut/upgrades/v7.1.x/upgrade-info.json @@ -0,0 +1 @@ +{"name":"v7.1.x","height":14369500} diff --git a/tools/cosmovisor/upgrades-info/v7.1.x/fxcore/upgrades/v7.1.x/upgrade-info.json b/tools/cosmovisor/upgrades-info/v7.1.x/fxcore/upgrades/v7.1.x/upgrade-info.json new file mode 100644 index 000000000000..9dd05227023f --- /dev/null +++ b/tools/cosmovisor/upgrades-info/v7.1.x/fxcore/upgrades/v7.1.x/upgrade-info.json @@ -0,0 +1 @@ +{"name":"v7.1.x","height":9223372036854775807}