diff --git a/Makefile b/Makefile index a71f48b4045..83500617e61 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ clean: ############################################################################## .PHONY: check-full -check-full: update check staticcheck check-docker-compose +check-full: update check staticcheck .PHONY: check-approvals check-approvals: @@ -245,10 +245,6 @@ ifndef CHECK_HEADERS_DISABLED @$(GOLICENSER) -d -exclude build -license Elasticv2 x-pack endif -.PHONY: check-docker-compose -check-docker-compose: - ./script/check_docker_compose.sh $(BEATS_VERSION) - check-package: build-package $(ELASTICPACKAGE) @(cd build/apmpackage && $(ELASTICPACKAGE) format --fail-fast && $(ELASTICPACKAGE) lint) @go run cmd/check-internal-metrics/main.go diff --git a/script/check_docker_compose.sh b/script/check_docker_compose.sh deleted file mode 100755 index 01e3ca2386c..00000000000 --- a/script/check_docker_compose.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -# -# This checks that image versions defined in docker-compose.yml are -# up to date for the given branch name (master, 7.x, 7.13, etc.) -# -# Example usage: ./check_docker_compose.sh 7.x -set -e - -SDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -BRANCH=$* -LATEST_SNAPSHOT_VERSION=$($SDIR/latest_snapshot_version.sh $BRANCH) - -# latest_snapshot_version.sh returns "" if $BRANCH has no snapshot yet. -# If no snapshot is available, just exit. -[ -n "$LATEST_SNAPSHOT_VERSION" ] || exit 0 - -# Check docker.elastic.co images listed in docker-compose.yml are up to date. -# Ignore any images that don't end with "-SNAPSHOT", such as package-registry. -IMAGES=$(grep 'image: docker.elastic.co.*-SNAPSHOT' $SDIR/../docker-compose.yml | sed 's/.*image: \(.*\)/\1/') -for IMAGE in $IMAGES; do - # When using pinned snapshot versions the format is ..--SNAPSHOT - # therefore disregard the "-" - IMAGE_TAG=$(echo "$IMAGE" | cut -d: -f2 | sed 's#\(.*\)-\(.*\)-\(SNAPSHOT\)#\1-\3#') - - if [ "$IMAGE_TAG" = "$LATEST_SNAPSHOT_VERSION" ]; then - printf "docker-compose.yml: image %s up to date (latest '%s' snapshot version %s)\n" "$IMAGE" "$BRANCH" "$LATEST_SNAPSHOT_VERSION" - else - printf "docker-compose.yml: image %s is out of date (latest '%s' snapshot version is %s)\n" "$IMAGE" "$BRANCH" "$LATEST_SNAPSHOT_VERSION" - exit 1 - fi -done