From 922cfecdd8b07bddb3f34fa49576c6d8741632cb Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 31 Mar 2023 09:01:22 -0400 Subject: [PATCH] chore: rename for blink labs Signed-off-by: Chris Gianelloni --- .github/workflows/ci-docker.yml | 18 ++++---- .github/workflows/publish.yml | 73 +++++++++++++++++---------------- LICENSE | 3 +- 3 files changed, 49 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 1ea508f..606db60 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -7,7 +7,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: cloudstruct/cardano-node + IMAGE_NAME: blinklabs/cardano-node jobs: build-amd64: @@ -15,8 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - name: qemu - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 + uses: docker/setup-qemu-action@v2 + - uses: docker/setup-buildx-action@v2 - uses: actions/cache@v3 with: path: /tmp/.buildx-cache @@ -24,14 +24,14 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch }}-buildx- - id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: | latest=false suffix=-amd64 - name: build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: false @@ -52,8 +52,8 @@ jobs: steps: - uses: actions/checkout@v2 - name: qemu - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 + uses: docker/setup-qemu-action@v2 + - uses: docker/setup-buildx-action@v2 - uses: actions/cache@v3 with: path: /tmp/.buildx-cache @@ -61,14 +61,14 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch }}-buildx- - id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: | latest=false suffix=-arm64v8 - name: build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: false diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 316d275..a0719f7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,8 @@ on: concurrency: ${{ github.ref }} env: - IMAGE_NAME: cloudstruct/cardano-node + DOCKER_IMAGE_NAME: blinklabs/cardano-node + GHCR_IMAGE_NAME: ghcr.io/blinklabs-io/cardano-node jobs: @@ -19,14 +20,14 @@ jobs: packages: write steps: - uses: actions/checkout@v2 - - uses: docker/setup-buildx-action@v1 + - uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: - username: cloudstruct + username: blinklabs password: ${{ secrets.DOCKER_PASSWORD }} # uses token - name: Login to GHCR - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} @@ -38,11 +39,10 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch }}-buildx- - id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: | - ${{ env.IMAGE_NAME }} - ghcr.io/${{ env.IMAGE_NAME }} + ${{ env.GHCR_IMAGE_NAME }} flavor: | latest=false suffix=-amd64 @@ -54,7 +54,7 @@ jobs: # semver type=semver,pattern={{version}} - name: push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: true @@ -86,14 +86,14 @@ jobs: packages: write steps: - uses: actions/checkout@v2 - - uses: docker/setup-buildx-action@v1 + - uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: - username: cloudstruct + username: blinklabs password: ${{ secrets.DOCKER_PASSWORD }} # uses token - name: Login to GHCR - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} @@ -105,11 +105,10 @@ jobs: restore-keys: | ${{ runner.os }}-${{ runner.arch }}-buildx- - id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: | - ${{ env.IMAGE_NAME }} - ghcr.io/${{ env.IMAGE_NAME }} + ${{ env.GHCR_IMAGE_NAME }} flavor: | latest=false suffix=-arm64v8 @@ -121,7 +120,7 @@ jobs: # semver type=semver,pattern={{version}} - name: push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: true @@ -154,36 +153,38 @@ jobs: packages: write steps: - uses: actions/checkout@v2 - - uses: docker/setup-buildx-action@v1 + - uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: - username: cloudstruct + username: blinklabs password: ${{ secrets.DOCKER_PASSWORD }} # uses token - name: Login to GHCR - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - id: meta-dockerhub name: Metadata - Docker Hub - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: - images: ${{ env.IMAGE_NAME }} + images: ${{ env.DOCKER_IMAGE_NAME }} flavor: | latest=false tags: | + # Only version, no revision + type=match,pattern=v(.*)-(.*),group=1 # branch type=ref,event=branch # semver type=semver,pattern={{version}} - id: meta-dockerhub-tag name: Metadata - Docker Hub (Tags) - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: | - ${{ env.IMAGE_NAME }} + ${{ env.DOCKER_IMAGE_NAME }} flavor: | latest=false tags: | @@ -191,22 +192,24 @@ jobs: type=match,pattern=v(.*)-(.*),group=1 - id: meta-ghcr name: Metadata - GHCR - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: - images: ghcr.io/${{ env.IMAGE_NAME }} + images: ${{ env.GHCR_IMAGE_NAME }} flavor: | latest=false tags: | + # Only version, no revision + type=match,pattern=v(.*)-(.*),group=1 # branch type=ref,event=branch # semver type=semver,pattern={{version}} - id: meta-ghcr-tag name: Metadata - GHCR (Tags) - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: | - ghcr.io/${{ env.IMAGE_NAME }} + ${{ env.GHCR_IMAGE_NAME }} flavor: | latest=false tags: | @@ -219,10 +222,10 @@ jobs: run: docker manifest create ${{ steps.meta-ghcr.outputs.tags }} --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8 # Optional manifest for latest - name: manifest-dockerhub-latest - run: docker manifest create ${{ env.IMAGE_NAME }}:latest --amend ${{ steps.meta-dockerhub.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub.outputs.tags }}-arm64v8 + run: docker manifest create ${{ env.DOCKER_IMAGE_NAME }}:latest --amend ${{ steps.meta-dockerhub.outputs.tags }}-amd64 --amend ${{ steps.meta-dockerhub.outputs.tags }}-arm64v8 if: startsWith(github.ref, 'refs/tags/') - name: manifest-ghcr-latest - run: docker manifest create ghcr.io/${{ env.IMAGE_NAME }}:latest --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8 + run: docker manifest create ${{ env.GHCR_IMAGE_NAME }}:latest --amend ${{ steps.meta-ghcr.outputs.tags }}-amd64 --amend ${{ steps.meta-ghcr.outputs.tags }}-arm64v8 if: startsWith(github.ref, 'refs/tags/') # Optional manifest for tag versions (includes revisions) - name: manifest-dockerhub-tags @@ -237,10 +240,10 @@ jobs: - name: push-ghcr run: docker manifest push ${{ steps.meta-ghcr.outputs.tags }} - name: push-dockerhub-latest - run: docker manifest push ${{ env.IMAGE_NAME }}:latest + run: docker manifest push ${{ env.DOCKER_IMAGE_NAME }}:latest if: startsWith(github.ref, 'refs/tags/') - name: push-ghcr-latest - run: docker manifest push ghcr.io/${{ env.IMAGE_NAME }}:latest + run: docker manifest push ${{ env.GHCR_IMAGE_NAME }}:latest if: startsWith(github.ref, 'refs/tags/') - name: push-dockerhub-tags run: docker manifest push ${{ steps.meta-dockerhub-tag.outputs.tags }} @@ -252,9 +255,9 @@ jobs: - name: Docker Hub Description uses: peter-evans/dockerhub-description@v3 with: - username: cloudstruct + username: blinklabs password: ${{ secrets.DOCKER_PASSWORD }} - repository: ${{ env.IMAGE_NAME }} + repository: ${{ env.DOCKER_IMAGE_NAME }} readme-filepath: ./README.md short-description: "Cardano Node built from source on Debian" diff --git a/LICENSE b/LICENSE index fdbd4d9..63c5562 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2022 CloudStruct +Copyright (c) 2022 CloudStruct, LLC. +Copyright (c) 2023 Blink Labs, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal