Skip to content

Commit 03cd501

Browse files
author
=
committed
Update image name
1 parent d97bd07 commit 03cd501

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/build-and-test.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ env:
1010
# See: https://github.com/actions/cache/issues/810#issuecomment-1222550359
1111
# Cache downloads for this workflow consistently run in under 1 minute
1212
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
13+
REGISTRY: ghcr.io
1314

1415
concurrency:
1516
group: ${{ github.workflow }}-${{ github.head_ref }}
@@ -510,24 +511,25 @@ jobs:
510511
- name: Build Docker Image
511512
if: steps.check.outputs.passed == 'true'
512513
run: |
513-
make docker-otelcontribcol
514-
docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
515-
docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:latest
514+
make docker-aspenmeshcollector
515+
docker tag aspenmesh-collector:latest aspenmesh/aspenmesh-collector:$GITHUB_SHA
516+
docker tag aspenmesh-collector:latest aspenmesh/aspenmesh-collector:latest
516517
- name: Validate Docker Image
517518
if: steps.check.outputs.passed == 'true'
518519
run: |
519-
docker run otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA --version
520-
docker run otel/opentelemetry-collector-contrib-dev:latest --version
520+
docker run aspenmesh/aspenmesh-collector:$GITHUB_SHA --version
521+
docker run aspenmesh/aspenmesh-collector:latest --version
521522
- name: Login to Docker Hub
522523
uses: docker/login-action@v2
523524
with:
524-
username: ${{ secrets.DOCKER_USERNAME }}
525-
password: ${{ secrets.DOCKER_PASSWORD }}
525+
registry: ${{ env.REGISTRY }}
526+
username: ${{ github.actor }}
527+
password: ${{ secrets.GITHUB_TOKEN }}
526528
- name: Push Docker Image
527529
if: steps.check.outputs.passed == 'true'
528530
run: |
529-
docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
530-
docker push otel/opentelemetry-collector-contrib-dev:latest
531+
docker push aspenmesh/aspenmesh-collector:$GITHUB_SHA
532+
docker push aspenmesh/aspenmesh-collector:latest
531533
publish-stable:
532534
runs-on: ubuntu-latest
533535
needs: [lint, unittest, integration-tests, build-package]
@@ -562,7 +564,7 @@ jobs:
562564
- name: Create Github Release
563565
run: |
564566
mkdir -p dist/
565-
ghr -t $GITHUB_TOKEN -u open-telemetry -r opentelemetry-collector-contrib --replace $RELEASE_TAG dist/
567+
ghr -t $GITHUB_TOKEN -u aspenmesh -r aspenmesh-collector --replace $RELEASE_TAG dist/
566568
env:
567569
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
568570
RELEASE_TAG: ${{ steps.github_tag.outputs.tag }}

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ ifndef COMPONENT
253253
$(error COMPONENT variable was not defined)
254254
endif
255255

256-
.PHONY: docker-otelcontribcol
257-
docker-otelcontribcol:
258-
COMPONENT=otelcontribcol $(MAKE) docker-component
256+
.PHONY: docker-aspenmeshcollector
257+
docker-aspenmeshcollector:
258+
COMPONENT=aspenmesh-collector $(MAKE) docker-component
259259

260260
.PHONY: generate
261261
generate:

0 commit comments

Comments
 (0)