Skip to content

Commit caaa83b

Browse files
committed
fix: only publish to dockerhub
1 parent 76e6b93 commit caaa83b

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

.github/workflows/release-nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Release Nightly
22
on:
33
push:
44
branches: [v2]
5+
pull_request:
6+
branches: [v2]
57
concurrency:
68
group: ${{ github.workflow }}-${{ github.ref }}
79
cancel-in-progress: true

Makefile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ release-otel-collector:
7676
docker buildx build --platform ${BUILD_PLATFORMS} ./docker/otel-collector \
7777
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
7878
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
79-
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
80-
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION} \
79+
# -t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
80+
# -t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION} \
8181
--target prod \
8282
--push \
8383
--cache-from=type=gha \
@@ -94,8 +94,8 @@ release-local:
9494
--platform ${BUILD_PLATFORMS} \
9595
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
9696
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
97-
-t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION} \
98-
-t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
97+
# -t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION} \
98+
# -t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
9999
--target all-in-one-noauth \
100100
--push \
101101
--cache-from=type=gha \
@@ -112,8 +112,8 @@ release-all-in-one:
112112
--platform ${BUILD_PLATFORMS} \
113113
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
114114
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
115-
-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION} \
116-
-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
115+
# -t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION} \
116+
# -t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
117117
--target all-in-one-auth \
118118
--push \
119119
--cache-from=type=gha \
@@ -128,8 +128,8 @@ release-app:
128128
--platform ${BUILD_PLATFORMS} \
129129
-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
130130
-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION} \
131-
-t ${IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
132-
-t ${IMAGE_NAME}:${IMAGE_VERSION} \
131+
# -t ${IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
132+
# -t ${IMAGE_NAME}:${IMAGE_VERSION} \
133133
--target prod \
134134
--push \
135135
--cache-from=type=gha \
@@ -139,7 +139,6 @@ release-app:
139139
release-otel-collector-nightly:
140140
docker buildx build --platform ${BUILD_PLATFORMS} ./docker/otel-collector \
141141
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
142-
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
143142
--target prod \
144143
--push \
145144
--cache-from=type=gha \
@@ -153,7 +152,6 @@ release-app-nightly:
153152
--build-context app=./packages/app \
154153
--platform ${BUILD_PLATFORMS} \
155154
-t ${IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
156-
-t ${IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
157155
--target prod \
158156
--push \
159157
--cache-from=type=gha \
@@ -169,7 +167,6 @@ release-local-nightly:
169167
--build-context app=./packages/app \
170168
--platform ${BUILD_PLATFORMS} \
171169
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
172-
-t ${LOCAL_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
173170
--target all-in-one-noauth \
174171
--push \
175172
--cache-from=type=gha \
@@ -185,7 +182,6 @@ release-all-in-one-nightly:
185182
--build-context app=./packages/app \
186183
--platform ${BUILD_PLATFORMS} \
187184
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
188-
-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
189185
--target all-in-one-auth \
190186
--push \
191187
--cache-from=type=gha \

0 commit comments

Comments
 (0)