Skip to content

Commit

Permalink
Merge pull request #159 from ethpandaops/bbusa/build-args
Browse files Browse the repository at this point in the history
feat: add build args
  • Loading branch information
barnabasbusa authored May 2, 2024
2 parents 89f90d1 + 85a13c4 commit dfdca4f
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .github/actions/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ inputs:
description: The platform to build for
type: string
required: true
build_args:
description: Build arguments to pass to the Docker build
default: ""
type: string
required: false
# Secrets
DOCKER_USERNAME:
required: true
Expand Down Expand Up @@ -130,6 +135,7 @@ runs:
tags: ${{ inputs.target_repository }}:${{ inputs.target_tag }}-${{ steps.git_commit_hash.outputs.git_commit_hash }},${{ inputs.target_repository }}:${{ inputs.target_tag }}
push: true
platforms: ${{ inputs.platform }}
build-args: ${{ inputs.build_args }}
labels: |
ethpandaops.io.repo=${{ inputs.source_repository }}
ethpandaops.io.commitRef=${{ inputs.source_ref }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/build-push-lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ on:
description: Override target docker tag (defaults to the above source ref if left blank)
type: string
required: false
build_args:
description: Build arguments to pass to the Docker build
default: ""
type: string
required: false

jobs:
prepare:
Expand Down Expand Up @@ -51,6 +56,7 @@ jobs:
target_repository: ethpandaops/lighthouse
target_dockerfile: ./lighthouse/Dockerfile
platform: ${{ matrix.platform }}
build_args: ${{ inputs.build_args }}

DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/build-push-mev-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ on:
description: Override target docker tag (defaults to the above source ref if left blank)
type: string
required: false
build_args:
description: Build arguments to pass to the Docker build
default: ""
type: string
required: false

jobs:
prepare:
Expand Down Expand Up @@ -69,6 +74,7 @@ jobs:
target_tag: ${{ inputs.docker_tag || inputs.ref }}
target_repository: ethpandaops/mev-rs
platforms: ${{ needs.prepare.outputs.platforms }}
build_args: ${{ inputs.build_args }}

DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}"
Expand Down
14 changes: 11 additions & 3 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
target:
tag: unstable-minimal
repository: ethpandaops/lighthouse
dockerfile: ./lighthouse/Dockerfile.minimal
build_args: FEATURES=spec-minimal
dockerfile: ./lighthouse/Dockerfile
# Xatu Sentry builds
- source:
repository: sigp/lighthouse
Expand Down Expand Up @@ -405,11 +406,18 @@
dockerfile: ./grandine/Dockerfile.minimal

#############
# goteth #
# mev-rs #
#############
- source:
repository: ralexstokes/mev-rs
ref: main
target:
tag: main
repository: ethpandaops/mev-rs
repository: ethpandaops/mev-rs
- source:
repository: ralexstokes/mev-rs
ref: main
target:
tag: main-minimal
repository: ethpandaops/mev-rs
build_args: --features minimal-preset
13 changes: 0 additions & 13 deletions lighthouse/Dockerfile.minimal

This file was deleted.

1 change: 1 addition & 0 deletions schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ target:
tag: str()
repository: str()
dockerfile: str(required=False)
build_args: str(required=False)

0 comments on commit dfdca4f

Please sign in to comment.