diff --git a/Makefile b/Makefile index 965f0d6f8..b1ee21b99 100644 --- a/Makefile +++ b/Makefile @@ -570,15 +570,6 @@ dist: + $(MAKE) dist-macos + $(MAKE) dist-macos-arm64 -#- this simple test will show any missing dynamically-linked Glibc symbols in the target distro -dist-test: - docker rm nimbus-eth2-dist-test $(HANDLE_OUTPUT) || true - cd docker/dist && \ - for DISTRO in debian-bullseye; do \ - DOCKER_BUILDKIT=1 docker build -f Dockerfile.$${DISTRO} -t nimbus-eth2-dist-test --progress=plain --build-arg USER_ID=$$(id -u) --build-arg GROUP_ID=$$(id -g) . && \ - docker run --rm --name nimbus-eth2-dist-test -v $(CURDIR):/home/user/nimbus-eth2 nimbus-eth2-dist-test; \ - done - #- Build and run benchmarks using an external repo (which can be used easily on # older commits, before this Make target was added). #- It's up to the user to create a benchmarking environment that minimises the diff --git a/docker/dist/Dockerfile.debian-bullseye b/docker/dist/Dockerfile.debian-bullseye deleted file mode 100644 index e8722f815..000000000 --- a/docker/dist/Dockerfile.debian-bullseye +++ /dev/null @@ -1,17 +0,0 @@ -FROM debian:bullseye-slim - -SHELL ["/bin/bash", "-c"] - -ARG USER_ID -ARG GROUP_ID - -RUN addgroup --gid ${GROUP_ID} user; \ - adduser --disabled-password --gecos '' --uid ${USER_ID} --gid ${GROUP_ID} user; - -USER user - -STOPSIGNAL SIGINT - -COPY "entry_point_test.sh" "/home/user/" -ENTRYPOINT ["/home/user/entry_point_test.sh"] - diff --git a/docker/dist/entry_point_test.sh b/docker/dist/entry_point_test.sh deleted file mode 100755 index 6b982884f..000000000 --- a/docker/dist/entry_point_test.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -e - -cd /home/user/nimbus-eth2 - -PREFIX="nimbus-eth2_Linux_amd64_" - -NUM_ARCHIVES=$(ls "dist/${PREFIX}"*.tar.gz 2>/dev/null | wc -l) -if [[ $NUM_ARCHIVES -eq 0 ]]; then - echo "No archive found matching \"dist/${PREFIX}*.tar.gz\". Aborting." - exit 1 -elif [[ $NUM_ARCHIVES -gt 1 ]]; then - echo "More than one archive found matching \"dist/${PREFIX}*.tar.gz\". Aborting." - exit 1 -fi - -cd dist -ARCHIVE=$(echo ${PREFIX}*.tar.gz) -ARCHIVE_DIR="${ARCHIVE%.tar.gz}" -rm -rf ${ARCHIVE_DIR} -tar xzf "${ARCHIVE}" -cd "${ARCHIVE_DIR}" -./nimbus_beacon_node --help -cd .. -rm -rf ${ARCHIVE_DIR} -