From 58dbc044eb5f34f2e1d045da536691f88c1f9416 Mon Sep 17 00:00:00 2001
From: adeeri <adee.ritman@wikimedia.de>
Date: Mon, 17 Jun 2024 16:14:11 +0200
Subject: [PATCH] Update naming and initial versions

---
 variables.env   | 19 +++++++++++--------
 versions.inc.sh | 13 ++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/variables.env b/variables.env
index e362b22b7..7521e2df8 100644
--- a/variables.env
+++ b/variables.env
@@ -7,8 +7,8 @@
 # Append -prerelease while working on releases.
 # Remove -prerelease when ready to merge release to the release branch.
 # Call it main on the main branch.
-WIKIBASE_VERSION=2.3.0
-DEPLOYMENT_KIT_VERSION=4.1.0
+WIKIBASE_VERSION=3.0.0
+DEPLOY_VERSION=3.0.0
 
 
 # ##############################################################################
@@ -23,28 +23,31 @@ MEDIAWIKI_VERSION=1.41.1
 # ##############################################################################
 # Wikidata Query Service Version
 # ##############################################################################
+# Update to reflect upstream changes
+WDQS_WBS_VERSION=1.0.0
+
 # Does not follow laws of god or men.
 # Update to the latest version for major releases.
 # Reason about changes for patch versions.
 # as per https://github.com/wikimedia/wikidata-query-rdf/tags
 # and https://archiva.wikimedia.org/repository/releases/org/wikidata/query/rdf/service/
 # Compare to previous version: https://github.com/wikimedia/wikidata-query-rdf/compare/query-service-parent-0.3.135...query-service-parent-0.3.137
-# TODO: Add our own (semantic) version to hide this one?
 WDQS_VERSION=0.3.137
-# TODO: Decide on the independent versions to start from
-WDQS_FRONTED_VERSION=$WIKIBASE_VERSION
-WDQS_PROXY_VERSION=$WIKIBASE_VERSION
+WDQS_FRONTED_VERSION=1.0.0
+WDQS_PROXY_VERSION=1.0.0
 
 
 # ##############################################################################
 # Elasticsearch
 # ##############################################################################
+# Update to reflect upstream changes
+ELASTICSEARCH_WBS_VERSION=1.0.0
+
 # ELASTICSEARCH_VERSION 7.10.3+ is release under a non-osi approved license
 # 7.10.2 is currently being used by the WMF 20230223
 # We cannot change this at the moment
 ELASTICSEARCH_VERSION=7.10.2
 ELASTICSEARCH_IMAGE_URL=docker.elastic.co/elasticsearch/elasticsearch:7.10.2
-# TODO: do we need ELASTICSEARCH_BUNDLE_VERSION so that the tag can express plugin changes?
 
 
 # ##############################################################################
@@ -169,7 +172,7 @@ WIKIBASEEDTF_COMMIT=5596403a27d8e4a5ac044257c49be3e0685318a6
 QUICKSTATEMENTS_COMMIT=c4b2c6b086b319aa32dcdd7a323edf188faaa66d
 # https://bitbucket.org/magnusmanske/magnustools/commits/branch/master
 MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5
-QUICKSTATEMENTS_VERSION=$WIKIBASE_VERSION
+QUICKSTATEMENTS_VERSION=1.0.0
 
 
 # ##############################################################################
diff --git a/versions.inc.sh b/versions.inc.sh
index 3f0c5012f..c779580be 100644
--- a/versions.inc.sh
+++ b/versions.inc.sh
@@ -18,7 +18,7 @@ function image_version {
     if [ "$image" = "wikibase" ]; then
         echo "$WIKIBASE_VERSION"
     elif [ "$image" = "elasticsearch" ]; then
-        echo "$ELASTICSEARCH_VERSION"
+        echo "$ELASTICSEARCH_WBS_VERSION"
     elif [ "$image" = "wdqs" ]; then
         echo "$WDQS_VERSION"
     elif [ "$image" = "wdqs-frontend" ]; then
@@ -35,17 +35,20 @@ function version_tags() {
     local version
     version=$(image_version "${image_name}")
 
-    # TODO: are these really necessary for all images?
     local tags=(
         "$version"
         "${version%.*}"
         "${version%%.*}"
-        "example-${DEPLOYMENT_KIT_VERSION%%.*}"
+        "deploy-${DEPLOY_VERSION%%.*}"
     )
 
-    # Extra tag for wikibase
+    # Extra tags
     if [[ "$image_name" == "wikibase" ]]; then
-        tags+=("${WIKIBASE_VERSION}_mw-${MEDIAWIKI_VERSION}")
+        tags+=("${WIKIBASE_VERSION}+mw-${MEDIAWIKI_VERSION}")
+    elif [[ "$image_name" == "elasticsearch" ]]; then
+        tags+=("${ELASTICSEARCH_WBS_VERSION}+${ELASTICSEARCH_VERSION}")
+    elif [[ "$image_name" == "wdqs" ]]; then
+        tags+=("${WDQS_WBS_VERSION}+${WDQS_VERSION}")
     fi
 
     printf "%s\n" "${tags[@]}"