mirror of
https://github.com/vacp2p/linea-besu.git
synced 2026-01-09 21:17:54 -05:00
Abstracts out which container registry (#6606)
* repo owner didn't include repo name * switches back to docker.io * specify registry and login consistently * artifacts workflow can be manually executed --------- Signed-off-by: Justin Florentine <justin+github@florentine.us>
This commit is contained in:
Justin Florentine
committed by
GitHub
GitHub
parent
e0bedff962
commit
56bc85205a
1
.github/workflows/artifacts.yml
vendored
1
.github/workflows/artifacts.yml
vendored
@@ -2,6 +2,7 @@
|
||||
name: artifacts
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
release:
|
||||
types:
|
||||
- prereleased
|
||||
|
||||
22
.github/workflows/docker.yml
vendored
22
.github/workflows/docker.yml
vendored
@@ -4,7 +4,7 @@ on:
|
||||
types:
|
||||
- prereleased
|
||||
env:
|
||||
registry: ghcr.io
|
||||
registry: docker.io
|
||||
|
||||
jobs:
|
||||
hadolint:
|
||||
@@ -70,22 +70,22 @@ jobs:
|
||||
run: |
|
||||
mkdir -p docker/reports
|
||||
curl -L https://github.com/aelsabbahy/goss/releases/download/v0.4.4/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
|
||||
- name: login to ghcr
|
||||
- name: login to ${{ env.registry }}
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
|
||||
with:
|
||||
registry: ${{ env.registry }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
username: ${{ secrets.DOCKER_USER_RW }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD_RW }}
|
||||
- name: build and test docker
|
||||
uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
|
||||
env:
|
||||
architecture: ${{ steps.prep.outputs.ARCH }}
|
||||
with:
|
||||
arguments: testDocker -PdockerOrgName=${{ env.registry }}/${{ github.repository_owner }} -Pversion=${{github.ref_name}} -Prelease.releaseVersion=${{ github.ref_name }}
|
||||
arguments: testDocker -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pversion=${{github.ref_name}} -Prelease.releaseVersion=${{ github.ref_name }}
|
||||
- name: publish
|
||||
env:
|
||||
architecture: ${{ steps.prep.outputs.ARCH }}
|
||||
run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ env.registry }}/${{ github.repository_owner }} -Pversion=${{github.ref_name}} -Prelease.releaseVersion=${{ github.ref_name }}
|
||||
run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pversion=${{github.ref_name}} -Prelease.releaseVersion=${{ github.ref_name }}
|
||||
multiArch:
|
||||
needs: buildDocker
|
||||
runs-on: ubuntu-22.04
|
||||
@@ -102,14 +102,14 @@ jobs:
|
||||
java-version: 17
|
||||
- name: setup gradle
|
||||
uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
|
||||
- name: login to ghcr
|
||||
- name: login to ${{ env.registry }}
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
|
||||
with:
|
||||
registry: ${{ env.registry }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
username: ${{ secrets.DOCKER_USER_RW }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD_RW }}
|
||||
- name: multi-arch docker
|
||||
run: ./gradlew manifestDocker -PdockerOrgName=${{ env.registry }}/${{ github.repository_owner }} -Pversion=${{github.ref_name}} -Prelease.releaseVersion=${{ github.ref_name }}
|
||||
run: ./gradlew manifestDocker -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pversion=${{github.ref_name}} -Prelease.releaseVersion=${{ github.ref_name }}
|
||||
amendNotes:
|
||||
needs: multiArch
|
||||
runs-on: ubuntu-22.04
|
||||
@@ -121,4 +121,4 @@ jobs:
|
||||
with:
|
||||
append_body: true
|
||||
body: |
|
||||
`docker pull ${{env.registry}}/${{github.repository_owner}}:${{github.ref_name}}`
|
||||
`docker pull ${{env.registry}}/${{secrets.DOCKER_ORG}}/besu:${{github.ref_name}}`
|
||||
|
||||
24
.github/workflows/nightly.yml
vendored
24
.github/workflows/nightly.yml
vendored
@@ -9,7 +9,7 @@ on:
|
||||
|
||||
env:
|
||||
nightly-tag: develop
|
||||
registry: ghcr.io
|
||||
registry: docker.io
|
||||
|
||||
jobs:
|
||||
hadolint:
|
||||
@@ -68,12 +68,12 @@ jobs:
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: 17
|
||||
- name: login to ghcr
|
||||
- name: login to ${{ env.registry }}
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
|
||||
with:
|
||||
registry: ${{ env.registry }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
username: ${{ secrets.DOCKER_USER_RW }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD_RW }}
|
||||
- name: build image
|
||||
uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
|
||||
with:
|
||||
@@ -88,16 +88,16 @@ jobs:
|
||||
architecture: ${{ steps.prep.outputs.ARCH }}
|
||||
with:
|
||||
arguments: testDocker -PdockerOrgName=${{ env.registry }}/${{ github.repository_owner }} -Pbranch=main
|
||||
- name: login to ghcr
|
||||
- name: login to $ {{ env.registry }}
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
|
||||
with:
|
||||
registry: ${{ env.registry }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
username: ${{ secrets.DOCKER_USER_RW }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD_RW }}
|
||||
- name: publish
|
||||
env:
|
||||
architecture: ${{ steps.prep.outputs.ARCH }}
|
||||
run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ env.registry }}/${{ github.repository_owner }} -Pbranch=main
|
||||
run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pbranch=main
|
||||
multiArch:
|
||||
permissions:
|
||||
contents: read
|
||||
@@ -114,12 +114,12 @@ jobs:
|
||||
java-version: 17
|
||||
- name: setup gradle
|
||||
uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
|
||||
- name: Login to DockerHub
|
||||
- name: Login to ${{ env.registry }}
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
|
||||
with:
|
||||
registry: ${{ env.registry }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
username: ${{ secrets.DOCKER_USER_RW }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD_RW }}
|
||||
- name: multi-arch docker
|
||||
run: ./gradlew manifestDocker -PdockerOrgName=${{ env.registry }}/${{ github.repository_owner }} -Pbranch=main
|
||||
run: ./gradlew manifestDocker -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pbranch=main
|
||||
|
||||
|
||||
14
.github/workflows/release.yml
vendored
14
.github/workflows/release.yml
vendored
@@ -3,6 +3,8 @@ on:
|
||||
workflow_dispatch:
|
||||
release:
|
||||
types: [released]
|
||||
env:
|
||||
registry: docker.io
|
||||
jobs:
|
||||
dockerPromoteX64:
|
||||
runs-on: ubuntu-22.04
|
||||
@@ -13,11 +15,15 @@ jobs:
|
||||
distribution: 'temurin' # See 'Supported distributions' for available options
|
||||
java-version: '17'
|
||||
cache: gradle
|
||||
- name: Login to DockerHub
|
||||
run: echo '${{ secrets.DOCKER_PASSWORD_RW }}' | docker login -u '${{ secrets.DOCKER_USER_RW }}' --password-stdin
|
||||
- name: login to ${{ env.registry }}
|
||||
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
|
||||
with:
|
||||
registry: ${{ env.registry }}
|
||||
username: ${{ secrets.DOCKER_USER_RW }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD_RW }}
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
|
||||
- name: Docker upload
|
||||
run: ./gradlew "-Prelease.releaseVersion=${{ github.ref_name }}" "-PdockerOrgName=${{ secrets.DOCKER_ORG }}" dockerUploadRelease
|
||||
run: ./gradlew "-Prelease.releaseVersion=${{ github.ref_name }}" "-PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }}" dockerUploadRelease
|
||||
- name: Docker manifest
|
||||
run: ./gradlew "-Prelease.releaseVersion=${{ github.ref_name }}" "-PdockerOrgName=${{ secrets.DOCKER_ORG }}" manifestDockerRelease
|
||||
run: ./gradlew "-Prelease.releaseVersion=${{ github.ref_name }}" "-PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }}" manifestDockerRelease
|
||||
|
||||
Reference in New Issue
Block a user