Skip to content

Commit 21d02e1

Browse files
authored
github action create build env (#324)
1 parent 9843f01 commit 21d02e1

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,27 @@ jobs:
1212
packages: write
1313

1414
env:
15-
IMAGE_VERSION: "${{ github.event.release.tag_name }}"
16-
15+
RELEASE_VERSION: "${{ github.event.release.tag_name }}"
1716

1817
steps:
1918
- uses: actions/checkout@v3
2019
with:
2120
fetch-depth: 0
21+
2222
# limit docker push image concurrency to 1
2323
# to avoid github package return 429 ratelimit error
2424
- name: Set docker upload concurrent
2525
run: |
2626
echo $'{"max-concurrent-uploads": 1}' | sudo dd status=none of=/etc/docker/daemon.json
2727
sudo service docker restart
28+
2829
- name: Log in to the Container registry
2930
uses: docker/login-action@v2
3031
with:
3132
registry: ghcr.io
3233
username: ${{ github.repository_owner }}
3334
password: ${{ secrets.GITHUB_TOKEN }}
35+
3436
- name: Log in to Docker Hub
3537
uses: docker/login-action@v2
3638
with:
@@ -39,20 +41,12 @@ jobs:
3941

4042
- name: build ghcr docker image
4143
run: make build-docker-images
42-
env:
43-
IMAGE_NAME: "ghcr.io/open-telemetry/demo"
4444

4545
- name: push ghcr image
4646
run: make push-docker-images
47-
env:
48-
IMAGE_NAME: "ghcr.io/open-telemetry/demo"
4947

5048
- name: build dockerhub docker image
5149
run: make build-docker-images
52-
env:
53-
IMAGE_NAME: "otel/demo"
5450

5551
- name: push dockerhub image
5652
run: make push-docker-images
57-
env:
58-
IMAGE_NAME: "otel/demo"

Makefile

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,21 @@ install-tools: $(MISSPELL)
5858
npm install
5959
@echo "All tools installed"
6060

61-
.PHONY: build-docker-images
62-
build-docker-images:
63-
docker compose -f docker-compose.yml build
61+
.PHONY: build-and-push-dockerhub
62+
build-and-push-dockerhub:
63+
docker compose --env-file .dockerhub.env -f docker-compose.yml build
64+
docker compose --env-file .dockerhub.env -f docker-compose.yml pusd
6465

65-
.PHONY: push-docker-images
66-
push-docker-images:
67-
docker compose -f docker-compose.yml push
66+
.PHONY: build-and-push-ghcr
67+
build-and-push-ghcr:
68+
docker compose --env-file .ghcr.env -f docker-compose.yml build
69+
docker compose --env-file .ghcr.env -f docker-compose.yml push
70+
71+
.PHONY: build-env-file
72+
build-env-file:
73+
cp .env .dockerhub.env
74+
sed -i '/IMAGE_VERSION=.*/c\IMAGE_VERSION=${RELEASE_VERSION}' .dockerhub.env
75+
sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=otel/demo' .dockerhub.env
76+
cp .env .ghcr.env
77+
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

0 commit comments

Comments
 (0)