Skip to content

Commit 6ca02d0

Browse files
wolf31o2wolf31o2
authored
Merge pull request #43 from blinklabs-io/chore/rename
chore: rename for blink labs
2 parents 6776c67 + 922cfec commit 6ca02d0

File tree

3 files changed

+49
-45
lines changed

3 files changed

+49
-45
lines changed

‎.github/workflows/ci-docker.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ on:
77

88
env:
99
REGISTRY: ghcr.io
10-
IMAGE_NAME: cloudstruct/cardano-node
10+
IMAGE_NAME: blinklabs/cardano-node
1111

1212
jobs:
1313
build-amd64:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: qemu
18-
uses: docker/setup-qemu-action@v1
19-
- uses: docker/setup-buildx-action@v1
18+
uses: docker/setup-qemu-action@v2
19+
- uses: docker/setup-buildx-action@v2
2020
- uses: actions/cache@v3
2121
with:
2222
path: /tmp/.buildx-cache
2323
key: ${{ runner.os }}-${{ runner.arch }}-buildx-${{ github.sha }}
2424
restore-keys: |
2525
${{ runner.os }}-${{ runner.arch }}-buildx-
2626
- id: meta
27-
uses: docker/metadata-action@v3
27+
uses: docker/metadata-action@v4
2828
with:
2929
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
3030
flavor: |
3131
latest=false
3232
suffix=-amd64
3333
- name: build
34-
uses: docker/build-push-action@v2
34+
uses: docker/build-push-action@v3
3535
with:
3636
context: .
3737
push: false
@@ -52,23 +52,23 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@v2
5454
- name: qemu
55-
uses: docker/setup-qemu-action@v1
56-
- uses: docker/setup-buildx-action@v1
55+
uses: docker/setup-qemu-action@v2
56+
- uses: docker/setup-buildx-action@v2
5757
- uses: actions/cache@v3
5858
with:
5959
path: /tmp/.buildx-cache
6060
key: ${{ runner.os }}-${{ runner.arch }}-buildx-${{ github.sha }}
6161
restore-keys: |
6262
${{ runner.os }}-${{ runner.arch }}-buildx-
6363
- id: meta
64-
uses: docker/metadata-action@v3
64+
uses: docker/metadata-action@v4
6565
with:
6666
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
6767
flavor: |
6868
latest=false
6969
suffix=-arm64v8
7070
- name: build
71-
uses: docker/build-push-action@v2
71+
uses: docker/build-push-action@v3
7272
with:
7373
context: .
7474
push: false

‎.github/workflows/publish.yml‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
concurrency: ${{ github.ref }}
99

1010
env:
11-
IMAGE_NAME: cloudstruct/cardano-node
11+
DOCKER_IMAGE_NAME: blinklabs/cardano-node
12+
GHCR_IMAGE_NAME: ghcr.io/blinklabs-io/cardano-node
1213

1314
jobs:
1415

@@ -19,14 +20,14 @@ jobs:
1920
packages: write
2021
steps:
2122
- uses: actions/checkout@v2
22-
- uses: docker/setup-buildx-action@v1
23+
- uses: docker/setup-buildx-action@v2
2324
- name: Login to Docker Hub
24-
uses: docker/login-action@v1
25+
uses: docker/login-action@v2
2526
with:
26-
username: cloudstruct
27+
username: blinklabs
2728
password: ${{ secrets.DOCKER_PASSWORD }} # uses token
2829
- name: Login to GHCR
29-
uses: docker/login-action@v1
30+
uses: docker/login-action@v2
3031
with:
3132
registry: ghcr.io
3233
username: ${{ github.actor }}
@@ -38,11 +39,10 @@ jobs:
3839
restore-keys: |
3940
${{ runner.os }}-${{ runner.arch }}-buildx-
4041
- id: meta
41-
uses: docker/metadata-action@v3
42+
uses: docker/metadata-action@v4
4243
with:
4344
images: |
44-
${{ env.IMAGE_NAME }}
45-
ghcr.io/${{ env.IMAGE_NAME }}
45+
${{ env.GHCR_IMAGE_NAME }}
4646
flavor: |
4747
latest=false
4848
suffix=-amd64
@@ -54,7 +54,7 @@ jobs:
5454
# semver
5555
type=semver,pattern={{version}}
5656
- name: push
57-
uses: docker/build-push-action@v2
57+
uses: docker/build-push-action@v3
5858
with:
5959
context: .
6060
push: true
@@ -86,14 +86,14 @@ jobs:
8686
packages: write
8787
steps:
8888
- uses: actions/checkout@v2
89-
- uses: docker/setup-buildx-action@v1
89+
- uses: docker/setup-buildx-action@v2
9090
- name: Login to Docker Hub
91-
uses: docker/login-action@v1
91+
uses: docker/login-action@v2
9292
with:
93-
username: cloudstruct
93+
username: blinklabs
9494
password: ${{ secrets.DOCKER_PASSWORD }} # uses token
9595
- name: Login to GHCR
96-
uses: docker/login-action@v1
96+
uses: docker/login-action@v2
9797
with:
9898
registry: ghcr.io
9999
username: ${{ github.actor }}
@@ -105,11 +105,10 @@ jobs:
105105
restore-keys: |
106106
${{ runner.os }}-${{ runner.arch }}-buildx-
107107
- id: meta
108-
uses: docker/metadata-action@v3
108+
uses: docker/metadata-action@v4
109109
with:
110110
images: |
111-
${{ env.IMAGE_NAME }}
112-
ghcr.io/${{ env.IMAGE_NAME }}
111+
${{ env.GHCR_IMAGE_NAME }}
113112
flavor: |
114113
latest=false
115114
suffix=-arm64v8
@@ -121,7 +120,7 @@ jobs:
121120
# semver
122121
type=semver,pattern={{version}}
123122
- name: push
124-
uses: docker/build-push-action@v2
123+
uses: docker/build-push-action@v3
125124
with:
126125
context: .
127126
push: true
@@ -154,59 +153,63 @@ jobs:
154153
packages: write
155154
steps:
156155
- uses: actions/checkout@v2
157-
- uses: docker/setup-buildx-action@v1
156+
- uses: docker/setup-buildx-action@v2
158157
- name: Login to Docker Hub
159-
uses: docker/login-action@v1
158+
uses: docker/login-action@v2
160159
with:
161-
username: cloudstruct
160+
username: blinklabs
162161
password: ${{ secrets.DOCKER_PASSWORD }} # uses token
163162
- name: Login to GHCR
164-
uses: docker/login-action@v1
163+
uses: docker/login-action@v2
165164
with:
166165
registry: ghcr.io
167166
username: ${{ github.actor }}
168167
password: ${{ secrets.GITHUB_TOKEN }}
169168
- id: meta-dockerhub
170169
name: Metadata - Docker Hub
171-
uses: docker/metadata-action@v3
170+
uses: docker/metadata-action@v4
172171
with:
173-
images: ${{ env.IMAGE_NAME }}
172+
images: ${{ env.DOCKER_IMAGE_NAME }}
174173
flavor: |
175174
latest=false
176175
tags: |
176+
# Only version, no revision
177+
type=match,pattern=v(.*)-(.*),group=1
177178
# branch
178179
type=ref,event=branch
179180
# semver
180181
type=semver,pattern={{version}}
181182
- id: meta-dockerhub-tag
182183
name: Metadata - Docker Hub (Tags)
183-
uses: docker/metadata-action@v3
184+
uses: docker/metadata-action@v4
184185
with:
185186
images: |
186-
${{ env.IMAGE_NAME }}
187+
${{ env.DOCKER_IMAGE_NAME }}
187188
flavor: |
188189
latest=false
189190
tags: |
190191
# Only version, no revision
191192
type=match,pattern=v(.*)-(.*),group=1
192193
- id: meta-ghcr
193194
name: Metadata - GHCR
194-
uses: docker/metadata-action@v3
195+
uses: docker/metadata-action@v4
195196
with:
196-
images: ghcr.io/${{ env.IMAGE_NAME }}
197+
images: ${{ env.GHCR_IMAGE_NAME }}
197198
flavor: |
198199
latest=false
199200
tags: |
201+
# Only version, no revision
202+
type=match,pattern=v(.*)-(.*),group=1
200203
# branch
201204
type=ref,event=branch
202205
# semver
203206
type=semver,pattern={{version}}
204207
- id: meta-ghcr-tag
205208
name: Metadata - GHCR (Tags)
206-
uses: docker/metadata-action@v3
209+
uses: docker/metadata-action@v4
207210
with:
208211
images: |
209-
ghcr.io/${{ env.IMAGE_NAME }}
212+
${{ env.GHCR_IMAGE_NAME }}
210213
flavor: |
211214
latest=false
212215
tags: |
@@ -219,10 +222,10 @@ jobs:
219222
run: docker manifest create ${{ steps.meta-ghcr.outputs.tags }} --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8
220223
# Optional manifest for latest
221224
- name: manifest-dockerhub-latest
222-
run: docker manifest create ${{ env.IMAGE_NAME }}:latest --amend ${{ steps.meta-dockerhub.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub.outputs.tags }}-arm64v8
225+
run: docker manifest create ${{ env.DOCKER_IMAGE_NAME }}:latest --amend ${{ steps.meta-dockerhub.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub.outputs.tags }}-arm64v8
223226
if: startsWith(github.ref, 'refs/tags/')
224227
- name: manifest-ghcr-latest
225-
run: docker manifest create ghcr.io/${{ env.IMAGE_NAME }}:latest --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8
228+
run: docker manifest create ${{ env.GHCR_IMAGE_NAME }}:latest --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8
226229
if: startsWith(github.ref, 'refs/tags/')
227230
# Optional manifest for tag versions (includes revisions)
228231
- name: manifest-dockerhub-tags
@@ -237,10 +240,10 @@ jobs:
237240
- name: push-ghcr
238241
run: docker manifest push ${{ steps.meta-ghcr.outputs.tags }}
239242
- name: push-dockerhub-latest
240-
run: docker manifest push ${{ env.IMAGE_NAME }}:latest
243+
run: docker manifest push ${{ env.DOCKER_IMAGE_NAME }}:latest
241244
if: startsWith(github.ref, 'refs/tags/')
242245
- name: push-ghcr-latest
243-
run: docker manifest push ghcr.io/${{ env.IMAGE_NAME }}:latest
246+
run: docker manifest push ${{ env.GHCR_IMAGE_NAME }}:latest
244247
if: startsWith(github.ref, 'refs/tags/')
245248
- name: push-dockerhub-tags
246249
run: docker manifest push ${{ steps.meta-dockerhub-tag.outputs.tags }}
@@ -252,9 +255,9 @@ jobs:
252255
- name: Docker Hub Description
253256
uses: peter-evans/dockerhub-description@v3
254257
with:
255-
username: cloudstruct
258+
username: blinklabs
256259
password: ${{ secrets.DOCKER_PASSWORD }}
257-
repository: ${{ env.IMAGE_NAME }}
260+
repository: ${{ env.DOCKER_IMAGE_NAME }}
258261
readme-filepath: ./README.md
259262
short-description: "Cardano Node built from source on Debian"
260263

‎LICENSE‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
MIT License
22

3-
Copyright (c) 2022 CloudStruct
3+
Copyright (c) 2022 CloudStruct, LLC.
4+
Copyright (c) 2023 Blink Labs, Inc.
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)