Skip to content

Commit bec1fc6

Browse files
rileyfiretailrileyfiretail
authored
Merge pull request #42 from FireTail-io/feat/fire-1839/publish-to-ghcr
feat/fire-1839/publish-to-ghcr (FIX)
2 parents 66c8235 + f132125 commit bec1fc6

File tree

3 files changed

+36
-31
lines changed

3 files changed

+36
-31
lines changed

‎.github/workflows/draft-release.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333

3434
- name: Set Image Tags From Release Output
3535
run: |
36-
cat <<HEREDOC >>${{ github.env }}
36+
cat <<HEREDOC >>${GITHUB_ENV}
37+
TAG_BASE=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
3738
PRERELEASE_IMAGE_TAG=${{ steps.draft_release.outputs.tag_name }}-prerelease
3839
PRERELEASE_LAMBDA_IMAGE_TAG=${{ steps.draft_release.outputs.tag_name }}-lambda-prerelease
3940
HEREDOC
@@ -48,33 +49,33 @@ jobs:
4849
run: |
4950
docker build \
5051
--target runtime \
51-
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_IMAGE_TAG }} \
52+
--tag ${{ env.TAG_BASE }}:${{ env.PRERELEASE_IMAGE_TAG }} \
5253
--file build_setup/Dockerfile \
5354
"${PWD}"
54-
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_IMAGE_TAG }} \
55-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-prerelease
56-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_IMAGE_TAG }}
57-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-prerelease
55+
docker tag ${{ env.TAG_BASE }}:${{ env.PRERELEASE_IMAGE_TAG }} \
56+
${{ env.TAG_BASE }}:latest-prerelease
57+
docker push ${{ env.TAG_BASE }}:${{ env.PRERELEASE_IMAGE_TAG }}
58+
docker push ${{ env.TAG_BASE }}:latest-prerelease
5859
5960
- name: Build and Push Lambda Image
6061
run: |
6162
docker build \
6263
--target runtime-lambda \
63-
--tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }} \
64+
--tag ${{ env.TAG_BASE }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }} \
6465
--file build_setup/Dockerfile \
6566
"${PWD}"
66-
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }} \
67-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-lambda-prerelease
68-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }}
69-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-lambda-prerelease
67+
docker tag ${{ env.TAG_BASE }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }} \
68+
${{ env.TAG_BASE }}:latest-lambda-prerelease
69+
docker push ${{ env.TAG_BASE }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }}
70+
docker push ${{ env.TAG_BASE }}:latest-lambda-prerelease
7071
7172
- name: Summarize Workflow Run
7273
run: |
7374
cat <<HEREDOC >>${GITHUB_STEP_SUMMARY}
7475
## Successfully Pushed:
7576
76-
- ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_IMAGE_TAG }}
77-
- ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-prerelease
78-
- ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }}
79-
- ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-lambda-prerelease
77+
- ${{ env.TAG_BASE }}:${{ env.PRERELEASE_IMAGE_TAG }}
78+
- ${{ env.TAG_BASE }}:latest-prerelease
79+
- ${{ env.TAG_BASE }}:${{ env.PRERELEASE_LAMBDA_IMAGE_TAG }}
80+
- ${{ env.TAG_BASE }}:latest-lambda-prerelease
8081
HEREDOC

‎.github/workflows/publish-release.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020

2121
steps:
2222

23+
- name: Set Image Tags
24+
run: |
25+
echo "TAG_BASE=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}" >>${GITHUB_ENV}
26+
2327
- name: Log In to the Container Registry
2428
run: |
2529
docker login ${{ env.REGISTRY }} \
@@ -28,23 +32,23 @@ jobs:
2832
2933
- name: Publish Prelease Lambda Image as Full Release
3034
run: |
31-
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-prerelease
32-
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-prerelease \
33-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
34-
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-prerelease \
35-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
36-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
37-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
35+
docker pull ${{ env.TAG_BASE }}:${{ github.ref_name }}-prerelease
36+
docker tag ${{ env.TAG_BASE }}:${{ github.ref_name }}-prerelease \
37+
${{ env.TAG_BASE }}:${{ github.ref_name }}
38+
docker tag ${{ env.TAG_BASE }}:${{ github.ref_name }}-prerelease \
39+
${{ env.TAG_BASE }}:latest
40+
docker push ${{ env.TAG_BASE }}:${{ github.ref_name }}
41+
docker push ${{ env.TAG_BASE }}:latest
3842
3943
- name: Publish Prelease Lambda Image as Full Release
4044
run: |
41-
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-lambda-prerelease
42-
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-lambda-prerelease \
43-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-lambda
44-
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-lambda-prerelease \
45-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-lambda
46-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-lambda
47-
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-lambda
45+
docker pull ${{ env.TAG_BASE }}:${{ github.ref_name }}-lambda-prerelease
46+
docker tag ${{ env.TAG_BASE }}:${{ github.ref_name }}-lambda-prerelease \
47+
${{ env.TAG_BASE }}:${{ github.ref_name }}-lambda
48+
docker tag ${{ env.TAG_BASE }}:${{ github.ref_name }}-lambda-prerelease \
49+
${{ env.TAG_BASE }}:latest-lambda
50+
docker push ${{ env.TAG_BASE }}:${{ github.ref_name }}-lambda
51+
docker push ${{ env.TAG_BASE }}:latest-lambda
4852
4953
- name: Summarize Workflow Run
5054
run: |

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,5 @@ docker run --rm \
7373
| -------------------- | ------------------------------------------------------------------------------------------------------------------------ | --------- | ------------------------------------------------ |
7474
| `GITHUB_TOKEN` | A classic GitHub personal access token. | Yes ✅ | None |
7575
| `FIRETAIL_APP_TOKEN` | An app token from the Firetail SaaS. | Yes ✅ | None |
76-
| `FIRETAIL_API_URL` | The URL of the Firetail SaaS' API. | No ❌ | `"https://api.saas.eu-west-1.prod.firetail.app"` |
77-
| `LOGGING_LEVEL` | The logging level provided to python's [logging](https://docs.python.org/3/library/logging.html#logging-levels) library. | No ❌ | `"INFO"` |
76+
| `FIRETAIL_API_URL` | The URL of the Firetail SaaS API. | No ❌ | `https://api.saas.eu-west-1.prod.firetail.app` |
77+
| `LOGGING_LEVEL` | The logging level provided to Python's [logging](https://docs.python.org/3/library/logging.html#logging-levels) library. | No ❌ | `INFO` |

0 commit comments

Comments
 (0)