chore: exit 2-beta pre-release phase (#871)

Author: wrn14897

.changeset/pre.json

@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "beta",
   "initialVersions": {
     "@hyperdx/api": "1.9.0",

.changeset/seven-steaks-smash.md

@@ -0,0 +1,7 @@
+---
+"@hyperdx/api": patch
+"@hyperdx/app": patch
+"@hyperdx/common-utils": patch
+---
+
+chore: GA v2

.env

@@ -10,8 +10,9 @@ OTEL_COLLECTOR_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-otel-collector
 OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-otel-collector
 CODE_VERSION=2.0.0-beta.17
 IMAGE_VERSION_SUB_TAG=.17
-IMAGE_VERSION=2-beta
+IMAGE_VERSION=2
 IMAGE_NIGHTLY_TAG=2-nightly
+IMAGE_LATEST_TAG=latest
 
 # Set up domain URLs
 HYPERDX_API_PORT=8000 #optional (should not be taken by other services)

Makefile

@@ -158,10 +158,8 @@ build-all-in-one-nightly:
 .PHONY: release-otel-collector
 release-otel-collector:
 	docker buildx build --platform ${BUILD_PLATFORMS} ./docker/otel-collector \
-		-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
 		-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
-		-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
-		-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION} \
+		-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
 		--target prod \
 		--push \
    	--cache-from=type=gha \
@@ -179,8 +177,6 @@ release-local:
 		--platform ${BUILD_PLATFORMS} \
 		-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
 		-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
-		-t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION} \
-		-t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
 		--target all-in-one-noauth \
 		--push \
    	--cache-from=type=gha \
@@ -198,8 +194,6 @@ release-all-in-one:
 		--platform ${BUILD_PLATFORMS} \
 		-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
 		-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
-		-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION} \
-		-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
 		--target all-in-one-auth \
 		--push \
    	--cache-from=type=gha \
@@ -213,10 +207,8 @@ release-app:
 		--build-context app=./packages/app \
 		--build-arg CODE_VERSION=${CODE_VERSION} \
 		--platform ${BUILD_PLATFORMS} \
-		-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
 		-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
-		-t ${IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
-		-t ${IMAGE_NAME}:${IMAGE_VERSION} \
+		-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
 		--target prod \
 		--push \
 	 	--cache-from=type=gha \
@@ -237,7 +229,7 @@ release-app-nightly:
 		--build-context hyperdx=./docker/hyperdx \
 		--build-context api=./packages/api \
 		--build-context app=./packages/app \
-		--build-arg CODE_VERSION=${CODE_VERSION} \
+		--build-arg CODE_VERSION=${IMAGE_NIGHTLY_TAG} \
 		--platform ${BUILD_PLATFORMS} \
 		-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
 		--target prod \
@@ -253,7 +245,7 @@ release-local-nightly:
 		--build-context hyperdx=./docker/hyperdx \
 		--build-context api=./packages/api \
 		--build-context app=./packages/app \
-		--build-arg CODE_VERSION=${CODE_VERSION} \
+		--build-arg CODE_VERSION=${IMAGE_NIGHTLY_TAG} \
 		--platform ${BUILD_PLATFORMS} \
 		-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
 		--target all-in-one-noauth \
@@ -269,7 +261,7 @@ release-all-in-one-nightly:
 		--build-context hyperdx=./docker/hyperdx \
 		--build-context api=./packages/api \
 		--build-context app=./packages/app \
-		--build-arg CODE_VERSION=${CODE_VERSION} \
+		--build-arg CODE_VERSION=${IMAGE_NIGHTLY_TAG} \
 		--platform ${BUILD_PLATFORMS} \
 		-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
 		--target all-in-one-auth \

version.sh

@@ -24,7 +24,7 @@ echo "Updated root package.json version to $API_LATEST_VERSION"
 sed -i '' -e "s/CODE_VERSION=.*/CODE_VERSION=$API_LATEST_VERSION/g" ./.env
 echo "Updated .env CODE_VERSION to $API_LATEST_VERSION"
 
-sed -i '' -e "s/IMAGE_VERSION_SUB_TAG=.*/IMAGE_VERSION_SUB_TAG=${API_LATEST_VERSION##*-beta}/g" ./.env
-echo "Updated .env IMAGE_VERSION_SUB_TAG to ${API_LATEST_VERSION##*-beta}"
+sed -i '' -e "s/IMAGE_VERSION_SUB_TAG=.*/IMAGE_VERSION_SUB_TAG=.${API_LATEST_VERSION#*.}/g" ./.env
+echo "Updated .env IMAGE_VERSION_SUB_TAG to .${API_LATEST_VERSION#*.}"
 
 echo "Run 'make release' to publish images"