From 50d76ca261c90be3d3c1eb98c62c0aaddcb818ff Mon Sep 17 00:00:00 2001
From: Yohan9206 <yohan_s@live.com>
Date: Mon, 14 Jul 2025 11:10:48 +0300
Subject: [PATCH] removing curl and adding condition for running both labels

---
 .github/workflows/deploy-devnet.yml | 10 +++++-----
 Dockerfile                          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy-devnet.yml b/.github/workflows/deploy-devnet.yml
index 6c0e2c10fd..c0bb767d01 100644
--- a/.github/workflows/deploy-devnet.yml
+++ b/.github/workflows/deploy-devnet.yml
@@ -8,12 +8,12 @@ on:
 
 jobs:
   deploy-hardhat:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'CI:Deploy')
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'CI:Deploy') || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
     runs-on: ubuntu-latest
 
     env:
       BASE_IMAGE: yohands/my_first_container:latest
-      FINAL_IMAGE: yohands/my_first_container:with-contracts
+      FINAL_IMAGE: yohands/my_first-contracts
       CONTAINER_NAME: devnet-node
 
     steps:
@@ -75,8 +75,8 @@ jobs:
 
       - name: Commit container with deployed contracts
         run: |
-          docker commit $CONTAINER_NAME $FINAL_IMAGE
-          docker tag $FINAL_IMAGE my_first_container:${{ env.COMMIT_SHA }}
+          docker commit $CONTAINER_NAME $FINAL_IMAGE:latest
+          docker tag $FINAL_IMAGE:latest $FINAL_IMAGE:${{ env.COMMIT_SHA }}
 
       - name: Stop and remove container
         run: docker rm -f $CONTAINER_NAME        
@@ -90,4 +90,4 @@ jobs:
       - name: Push image to Docker Hub
         run: |
           docker push $FINAL_IMAGE:latest
-          docker push $FINAL_IMAGE:${{ env.COMMIT_SHA }}
+          docker push $FINAL_IMAGE:${{ env.COMMIT_SHA }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9a1b9a05c1..9b70e9e8a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG BUILDNUM=""
 # Build Geth in a stock Go builder container
 FROM golang:1.24-alpine AS builder
 
-RUN apk add --no-cache gcc musl-dev linux-headers git curl
+RUN apk add --no-cache gcc musl-dev linux-headers git
 
 # Get dependencies - will also be cached if we won't change go.mod/go.sum
 COPY go.mod /go-ethereum/