From b77cd4092e21416c0804048b55b07579118965b4 Mon Sep 17 00:00:00 2001 From: tb06904 <141412860+tb06904@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:36:01 +0000 Subject: [PATCH] remove gaffer-gremlin build --- cd/build_core_images.sh | 1 - cd/build_images.sh | 3 --- cd/publish_images.sh | 1 - cd/update_versions.sh | 1 - docker/accumulo1.env | 1 - docker/accumulo2.env | 1 - 6 files changed, 8 deletions(-) diff --git a/cd/build_core_images.sh b/cd/build_core_images.sh index 40929810..0a581120 100755 --- a/cd/build_core_images.sh +++ b/cd/build_core_images.sh @@ -26,7 +26,6 @@ pushd "${ROOT_DIR}" || exit 1 # HADOOP_VERSION # GAFFER_VERSION # ACCUMULO_VERSION -# TINKERPOP_VERSION if [[ -f "${1}" ]]; then source "${1}" else diff --git a/cd/build_images.sh b/cd/build_images.sh index f69b9ab5..7a4ea054 100755 --- a/cd/build_images.sh +++ b/cd/build_images.sh @@ -28,7 +28,6 @@ pushd "${ROOT_DIR}" || exit 1 # GAFFERPY_VERSION # ACCUMULO_VERSION # SPARK_VERSION -# TINKERPOP_VERSION if [[ -f "${1}" ]]; then source "${1}" else @@ -42,8 +41,6 @@ docker compose --project-directory ./docker/gaffer-road-traffic-loader/ -f ./doc # Builds all of the notebook related images: docker compose --project-directory ./docker/gaffer-pyspark-notebook/ -f ./docker/gaffer-pyspark-notebook/docker-compose.yaml build notebook docker compose --project-directory ./docker/spark-py/ -f ./docker/spark-py/docker-compose.yaml build -# Builds the Gaffer Gremlin server -./docker/gaffer-gremlin/build.sh # Set $JHUB_OPTIONS_SERVER_VERSION source ./docker/gaffer-jhub-options-server/get-version.sh diff --git a/cd/publish_images.sh b/cd/publish_images.sh index 5c017f1b..1f9a0d43 100755 --- a/cd/publish_images.sh +++ b/cd/publish_images.sh @@ -102,7 +102,6 @@ pushContainer gchq/accumulo "${ACCUMULO_VERSION}" pushContainer gchq/gaffer "${GAFFER_VERSION}-accumulo-${ACCUMULO_VERSION}" pushContainer gchq/gaffer-rest "${GAFFER_VERSION}-accumulo-${ACCUMULO_VERSION}" pushContainer gchq/gaffer-road-traffic-loader "${GAFFER_VERSION}" -pushContainer gchq/gaffer-gremlin "${GAFFER_VERSION}-gremlin-${TINKERPOP_VERSION}" pushContainer gchq/gaffer-pyspark-notebook "${GAFFER_VERSION}" pushContainer gchq/gaffer-jhub-options-server "${JHUB_OPTIONS_SERVER_VERSION}" pushContainer gchq/spark-py "${SPARK_VERSION}" diff --git a/cd/update_versions.sh b/cd/update_versions.sh index dc15efcb..426bfe10 100755 --- a/cd/update_versions.sh +++ b/cd/update_versions.sh @@ -31,7 +31,6 @@ source ./docker/gaffer-jhub-options-server/get-version.sh find . -type f -exec sed -i "s/GAFFER_VERSION=[0-9]\.[0-9]\.[0-9]/GAFFER_VERSION=${APP_VERSION}/g" {} + find . -type f -exec sed -E -i "s/GAFFERPY_VERSION=(gafferpy-)?[0-9]\.[0-9]\.[0-9]/GAFFERPY_VERSION=\1${APP_VERSION}/g" {} + find . -type f -exec sed -i "s/GAFFER_TESTER_VERSION=[0-9]\.[0-9]\.[0-9]/GAFFER_TESTER_VERSION=${APP_VERSION}/g" {} + -sed -i'' -e "s/[0-9]\.[0-9]\.[0-9]/${APP_VERSION}/g" docker/gaffer-gremlin/pom.xml sed -i'' -e "s/BASE_IMAGE_TAG=[0-9]\.[0-9]\.[0-9]/BASE_IMAGE_TAG=${APP_VERSION}/g" docker/gaffer-kerberos/gaffer-krb/Dockerfile sed -i'' -e "s/BASE_IMAGE_TAG=[0-9]\.[0-9]\.[0-9]/BASE_IMAGE_TAG=${APP_VERSION}/g" docker/gaffer-kerberos/gaffer-rest-krb/Dockerfile diff --git a/docker/accumulo1.env b/docker/accumulo1.env index dacc4542..26f73892 100644 --- a/docker/accumulo1.env +++ b/docker/accumulo1.env @@ -7,5 +7,4 @@ GAFFER_VERSION=2.3.0 GAFFER_TESTER_VERSION=2.3.0 GAFFERPY_VERSION=2.3.0 SPARK_VERSION=3.1.2 -TINKERPOP_VERSION=3.7.1 KUBECTL_VERSION=1.23.0 diff --git a/docker/accumulo2.env b/docker/accumulo2.env index bea7dbcc..40ee1145 100644 --- a/docker/accumulo2.env +++ b/docker/accumulo2.env @@ -7,5 +7,4 @@ GAFFER_VERSION=2.3.0 GAFFER_TESTER_VERSION=2.3.0 GAFFERPY_VERSION=2.3.0 SPARK_VERSION=3.1.2 -TINKERPOP_VERSION=3.7.1 KUBECTL_VERSION=1.23.0