Skip to content

Commit 93110cf

Browse files
authored
improve release github action (#326)
1 parent 40915a4 commit 93110cf

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313

1414
env:
1515
RELEASE_VERSION: "${{ github.event.release.tag_name }}"
16+
DOCKERHUB_REPO: "otel/demo"
17+
GHCR_REPO: "ghcr.io/open-telemetry/demo"
1618

1719
steps:
1820
- uses: actions/checkout@v3

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ install-tools: $(MISSPELL)
6161
.PHONY: build-and-push-dockerhub
6262
build-and-push-dockerhub:
6363
docker compose --env-file .dockerhub.env -f docker-compose.yml build
64-
docker compose --env-file .dockerhub.env -f docker-compose.yml pusd
64+
docker compose --env-file .dockerhub.env -f docker-compose.yml push
6565

6666
.PHONY: build-and-push-ghcr
6767
build-and-push-ghcr:
@@ -72,7 +72,7 @@ build-and-push-ghcr:
7272
build-env-file:
7373
cp .env .dockerhub.env
7474
sed -i '/IMAGE_VERSION=.*/c\IMAGE_VERSION=${RELEASE_VERSION}' .dockerhub.env
75-
sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=otel/demo' .dockerhub.env
75+
sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=${DOCKERHUB_REPO}' .dockerhub.env
7676
cp .env .ghcr.env
7777
sed -i '/IMAGE_VERSION=.*/c\IMAGE_VERSION=${RELEASE_VERSION}' .ghcr.env
78-
sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=ghcr.io/open-telemetry/demo' .ghcr.env
78+
sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=${GHCR_REPO}' .ghcr.env

0 commit comments

Comments
 (0)