chore: use direct docker images name (#545)

PundiAI · Jun 3, 2024 · 26d8f35 · 26d8f35
1 parent 1e330fd
commit 26d8f35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -33,15 +33,15 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/${{ github.event.repository.name }}
+            ghcr.io/functionx/fx-core
+            functionx/fx-core
           tags: |
             type=semver,pattern={{version}}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: functionx
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Login to Container registry
@@ -76,15 +76,15 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/fxcorevisor_lite
-            ${{ secrets.DOCKER_HUB_USERNAME }}/fxcorevisor_lite
+            ghcr.io/functionx/fxcorevisor-lite
+            functionx/fxcorevisor-lite
           tags: |
             type=semver,pattern={{version}}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: functionx
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Login to Container registry
@@ -120,15 +120,15 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/${{ github.repository_owner }}/fxcorevisor
-            ${{ secrets.DOCKER_HUB_USERNAME }}/fxcorevisor
+            ghcr.io/functionx/fxcorevisor
+            functionx/fxcorevisor
           tags: |
             type=semver,pattern={{version}}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          username: functionx
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Login to Container registry

diff --git a/cosmovisor.Dockerfile b/cosmovisor.Dockerfile
@@ -38,9 +38,6 @@ ENV DAEMON_PREUPGRADE_MAX_RETRIES=3
 ENV COSMOVISOR_DISABLE_LOGS=false
 ENV COSMOVISOR_COLOR_LOGS=true
 
-COPY --from=builder /go/bin/cosmovisor /usr/bin/cosmovisor
-COPY --from=builder /app/build/bin/fxcored /usr/bin/fxcored
-
 # The copy directory needs to be changed in the next version
 COPY --from=fxv1 /usr/bin/fxcored /root/.fxcore/cosmovisor/genesis/bin/fxcored
 COPY --from=fxv2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/fxv2/bin/fxcored
@@ -54,6 +51,10 @@ COPY --from=fxv7 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.0.x/bin/f
 COPY --from=fxv7_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.1.x/bin/fxcored
 COPY --from=fxv7_2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.2.x/bin/fxcored
 
+COPY --from=builder /go/bin/cosmovisor /usr/bin/cosmovisor
+COPY --from=builder /app/build/bin/fxcored /usr/bin/fxcored
+COPY --from=builder /app/build/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.3.x/bin/fxcored
+
 RUN cosmovisor init /root/.fxcore/cosmovisor/genesis/bin/fxcored
 
 EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp

diff --git a/cosmovisor_lite.Dockerfile b/cosmovisor_lite.Dockerfile
@@ -31,14 +31,15 @@ ENV DAEMON_PREUPGRADE_MAX_RETRIES=3
 ENV COSMOVISOR_DISABLE_LOGS=false
 ENV COSMOVISOR_COLOR_LOGS=true
 
-COPY --from=builder /go/bin/cosmovisor /usr/bin/cosmovisor
-COPY --from=builder /app/build/bin/fxcored /usr/bin/fxcored
-
 COPY --from=fxv6 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v6.0.x/bin/fxcored
 COPY --from=fxv7 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.0.x/bin/fxcored
 COPY --from=fxv7_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.1.x/bin/fxcored
 COPY --from=fxv7_2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.2.x/bin/fxcored
 
+COPY --from=builder /go/bin/cosmovisor /usr/bin/cosmovisor
+COPY --from=builder /app/build/bin/fxcored /usr/bin/fxcored
+COPY --from=builder /app/build/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.3.x/bin/fxcored
+
 RUN cosmovisor init /root/.fxcore/cosmovisor/upgrades/v6.0.x/bin/fxcored
 
 EXPOSE 26656/tcp 26657/tcp 26660/tcp 9090/tcp 1317/tcp 8545/tcp 8546/tcp