Merge branch 'develop' into dependabot/npm_and_yarn/docs/multi-cd40ed…

…5513
NethermindEth · Oct 6, 2024 · 0f5f358 · 0f5f358
2 parents 9ed6e3c + 728a80e
commit 0f5f358
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 117 deletions.
diff --git a/cli/testdata/run_tests/no_env/docker-compose.yml b/cli/testdata/run_tests/no_env/docker-compose.yml
@@ -122,30 +122,11 @@ services:
           fi
         done
       "
-  validator-import:
-    container_name: validator-import-client
-    build:
-      context: github.com/NethermindEth/lighthouse-init-validator
-      args:
-        LH_VERSION: ${VL_IMAGE_VERSION}
-        NETWORK: ${NETWORK}
-    networks:
-    - sedge
-    volumes:
-    - ${KEYSTORE_DIR}:/keystore
-    - ${VL_DATA_DIR}:/data
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-        max-file: "10"
   validator:
     container_name: validator-client
     image: ${VL_IMAGE_VERSION}
     restart: unless-stopped
     depends_on:
-      validator-import:
-        condition: service_completed_successfully
       validator-blocker:
         condition: service_completed_successfully
       consensus:

diff --git a/cli/testdata/run_tests/no_version/docker-compose.yml b/cli/testdata/run_tests/no_version/docker-compose.yml
@@ -121,30 +121,11 @@ services:
           fi
         done
       "
-  validator-import:
-    container_name: validator-import-client
-    build:
-      context: github.com/NethermindEth/lighthouse-init-validator
-      args:
-        LH_VERSION: ${VL_IMAGE_VERSION}
-        NETWORK: ${NETWORK}
-    networks:
-    - sedge
-    volumes:
-    - ${KEYSTORE_DIR}:/keystore
-    - ${VL_DATA_DIR}:/data
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-        max-file: "10"
   validator:
     container_name: validator-client
     image: ${VL_IMAGE_VERSION}
     restart: unless-stopped
     depends_on:
-      validator-import:
-        condition: service_completed_successfully
       validator-blocker:
         condition: service_completed_successfully
       consensus:

diff --git a/cli/testdata/run_tests/valid/docker-compose.yml b/cli/testdata/run_tests/valid/docker-compose.yml
@@ -121,30 +121,11 @@ services:
           fi
         done
       "
-  validator-import:
-    container_name: validator-import-client
-    build:
-      context: github.com/NethermindEth/lighthouse-init-validator
-      args:
-        LH_VERSION: ${VL_IMAGE_VERSION}
-        NETWORK: ${NETWORK}
-    networks:
-    - sedge
-    volumes:
-    - ${KEYSTORE_DIR}:/keystore
-    - ${VL_DATA_DIR}:/data
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-        max-file: "10"
   validator:
     container_name: validator-client
     image: ${VL_IMAGE_VERSION}
     restart: unless-stopped
     depends_on:
-      validator-import:
-        condition: service_completed_successfully
       validator-blocker:
         condition: service_completed_successfully
       consensus:

diff --git a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml
@@ -122,30 +122,11 @@ services:
           fi
         done
       "
-  validator-import:
-    container_name: validator-import-client
-    build:
-      context: github.com/NethermindEth/lighthouse-init-validator
-      args:
-        LH_VERSION: ${VL_IMAGE_VERSION}
-        NETWORK: ${NETWORK}
-    networks:
-    - sedge
-    volumes:
-    - ${KEYSTORE_DIR}:/keystore
-    - ${VL_DATA_DIR}:/data
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-        max-file: "10"
   validator:
     container_name: validator-client
     image: ${VL_IMAGE_VERSION}
     restart: unless-stopped
     depends_on:
-      validator-import:
-        condition: service_completed_successfully
       validator-blocker:
         condition: service_completed_successfully
       consensus:

diff --git a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml
@@ -121,30 +121,11 @@ services:
           fi
         done
       "
-  validator-import:
-    container_name: validator-import-client
-    build:
-      context: github.com/NethermindEth/lighthouse-init-validator
-      args:
-        LH_VERSION: ${VL_IMAGE_VERSION}
-        NETWORK: ${NETWORK}
-    networks:
-    - sedge
-    volumes:
-    - ${KEYSTORE_DIR}:/keystore
-    - ${VL_DATA_DIR}:/data
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-        max-file: "10"
   validator:
     container_name: validator-client
     image: ${VL_IMAGE_VERSION}
     restart: unless-stopped
     depends_on:
-      validator-import:
-        condition: service_completed_successfully
       validator-blocker:
         condition: service_completed_successfully
       consensus:

diff --git a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml
@@ -122,30 +122,11 @@ services:
           fi
         done
       "
-  validator-import:
-    container_name: validator-import-client
-    build:
-      context: github.com/NethermindEth/lighthouse-init-validator
-      args:
-        LH_VERSION: ${VL_IMAGE_VERSION}
-        NETWORK: ${NETWORK}
-    networks:
-    - sedge
-    volumes:
-    - ${KEYSTORE_DIR}:/keystore
-    - ${VL_DATA_DIR}:/data
-    logging:
-      driver: json-file
-      options:
-        max-size: 10m
-        max-file: "10"
   validator:
     container_name: validator-client
     image: ${VL_IMAGE_VERSION}
     restart: unless-stopped
     depends_on:
-      validator-import:
-        condition: service_completed_successfully
       validator-blocker:
         condition: service_completed_successfully
       consensus:

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22.0 AS build
+FROM --platform=$BUILDPLATFORM golang:1.23rc2 AS build
 WORKDIR /src
 ARG TARGETOS
 ARG TARGETARCH
@@ -14,5 +14,5 @@ RUN if [ "$TARGETARCH" = "arm64" ] ;  \
       CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "${LDFLAGS}" -o /src/sedge $PACKAGE;  \
     fi
 
-FROM golang:1.18.3
-COPY --from=build /src/sedge /sedge
+FROM golang:1.23rc2
+COPY --from=build /src/sedge /sedge