Skip to content

Commit 3f29e33

Browse files
authored
chore: push local, aio, collector images to clickhouse/clickstack-xxx (#1376)
will migrate to `clickhouse/clickstack-xxx` repos in next PR
1 parent 09f07e5 commit 3f29e33

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

.env

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# Used by docker-compose.yml
22
HDX_IMAGE_REPO=docker.hyperdx.io
3-
IMAGE_NAME=ghcr.io/hyperdxio/hyperdx
43
IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx
5-
LOCAL_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-local
4+
NEXT_LOCAL_IMAGE_NAME_DOCKERHUB=clickhouse/clickstack-local
65
LOCAL_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-local
7-
ALL_IN_ONE_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-all-in-one
6+
NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB=clickhouse/clickstack-all-in-one
87
ALL_IN_ONE_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-all-in-one
9-
OTEL_COLLECTOR_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-otel-collector
8+
NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB=clickhouse/clickstack-otel-collector
109
OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-otel-collector
1110
CODE_VERSION=2.7.1
1211
IMAGE_VERSION_SUB_TAG=.7.1

Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ version:
9393
build-otel-collector:
9494
docker build ./docker/otel-collector \
9595
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
96+
-t ${NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
9697
--target prod
9798

9899
.PHONY: build-local
@@ -105,6 +106,7 @@ build-local:
105106
--build-context app=./packages/app \
106107
--build-arg CODE_VERSION=${CODE_VERSION} \
107108
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
109+
-t ${NEXT_LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
108110
--target all-in-one-noauth
109111

110112
.PHONY: build-all-in-one
@@ -117,6 +119,7 @@ build-all-in-one:
117119
--build-context app=./packages/app \
118120
--build-arg CODE_VERSION=${CODE_VERSION} \
119121
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
122+
-t ${NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
120123
--target all-in-one-auth
121124

122125
.PHONY: build-app
@@ -133,6 +136,7 @@ build-app:
133136
build-otel-collector-nightly:
134137
docker build ./docker/otel-collector \
135138
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
139+
-t ${NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
136140
--target prod
137141

138142
.PHONY: build-app-nightly
@@ -155,6 +159,7 @@ build-local-nightly:
155159
--build-context app=./packages/app \
156160
--build-arg CODE_VERSION=${CODE_VERSION} \
157161
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
162+
-t ${NEXT_LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
158163
--target all-in-one-noauth
159164

160165
.PHONY: build-all-in-one-nightly
@@ -167,6 +172,7 @@ build-all-in-one-nightly:
167172
--build-context app=./packages/app \
168173
--build-arg CODE_VERSION=${CODE_VERSION} \
169174
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
175+
-t ${NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
170176
--target all-in-one-auth
171177

172178
# Release targets (with multi-platform build and push)
@@ -182,6 +188,9 @@ release-otel-collector:
182188
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
183189
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
184190
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_LATEST_TAG} \
191+
-t ${NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
192+
-t ${NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
193+
-t ${NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_LATEST_TAG} \
185194
--target prod \
186195
--push \
187196
--cache-from=type=gha \
@@ -206,6 +215,9 @@ release-local:
206215
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
207216
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
208217
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_LATEST_TAG} \
218+
-t ${NEXT_LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
219+
-t ${NEXT_LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
220+
-t ${NEXT_LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_LATEST_TAG} \
209221
--target all-in-one-noauth \
210222
--push \
211223
--cache-from=type=gha \
@@ -230,6 +242,9 @@ release-all-in-one:
230242
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
231243
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
232244
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_LATEST_TAG} \
245+
-t ${NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
246+
-t ${NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
247+
-t ${NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_LATEST_TAG} \
233248
--target all-in-one-auth \
234249
--push \
235250
--cache-from=type=gha \
@@ -263,6 +278,7 @@ release-otel-collector-nightly:
263278
@echo "Building and pushing nightly tag ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG}..."; \
264279
docker buildx build --platform ${BUILD_PLATFORMS} ./docker/otel-collector \
265280
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
281+
-t ${NEXT_OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
266282
--target prod \
267283
--push \
268284
--cache-from=type=gha \
@@ -295,6 +311,7 @@ release-local-nightly:
295311
--build-arg CODE_VERSION=${IMAGE_NIGHTLY_TAG} \
296312
--platform ${BUILD_PLATFORMS} \
297313
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
314+
-t ${NEXT_LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
298315
--target all-in-one-noauth \
299316
--push \
300317
--cache-from=type=gha \
@@ -312,6 +329,7 @@ release-all-in-one-nightly:
312329
--build-arg CODE_VERSION=${IMAGE_NIGHTLY_TAG} \
313330
--platform ${BUILD_PLATFORMS} \
314331
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
332+
-t ${NEXT_ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
315333
--target all-in-one-auth \
316334
--push \
317335
--cache-from=type=gha \

0 commit comments

Comments
 (0)