Skip to content

Ci docker images#42

Merged
ftheirs merged 26 commits intomainfrom
ci_docker_images
Apr 17, 2025
Merged

Ci docker images#42
ftheirs merged 26 commits intomainfrom
ci_docker_images

Conversation

@ftheirs
Copy link
Copy Markdown
Contributor

@ftheirs ftheirs commented Apr 11, 2025

Use official Foundry image for Anvil service and for deploying mock-verifier contract
Update Madara dockerfile to build from main branch (monorepo)
Update Orchestrator dockerfile to build from main branch (monorepo)
Update Bootstrapper dockerfile to build from monorepo/bootstrapper branch (monorepo)
Add CI script to build and publish all the docker images

Removed old and unused files

@ftheirs ftheirs marked this pull request as ready for review April 11, 2025 17:54
@ftheirs ftheirs requested a review from raynaudoe April 16, 2025 12:56
Comment thread .github/workflows/docker_images.yml Outdated
description: 'Version tag (e.g., v1.0.0)'
required: true
specific_image:
description: 'Build only this image (leave empty to build all images)'
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe add a list of available images to build individually (if description max size allows it)

Comment on lines +66 to +70
tags: |
${{ env.DOCKER_ORGANIZATION }}/${{ matrix.image }}:latest
${{ env.DOCKER_ORGANIZATION }}/${{ matrix.image }}:${{ github.event.inputs.version }}-${{ steps.hash.outputs.hash }}
ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:latest
ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}:${{ github.event.inputs.version }}-${{ steps.hash.outputs.hash }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😎

@@ -0,0 +1,71 @@
name: "Publish Docker Images"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to be aligned with how the worfklow files are named in the madara monorepo, this file can be renamed to task-docker-build-and-publish.yml

let (
repo,
anvil_version,
helper_version,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this be named to something like l1_helper or similar that gives an idea of what it is more precisely

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm keeping this as helper (general purpose helper image) since it's right now to override the state from the L1 but it will be removed once SNOS version is updated in Orchestrator and this image won't be needed anymore.

Comment thread deps/bootstrapper/Dockerfile Outdated
WORKDIR /app

RUN git clone --recurse-submodules https://github.com/madara-alliance/madara-bootstrapper.git .
ENV BOOTSTRAPPER_VER="a99088a96a8126d33fef4fabba76a70032e601cf"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why this is needed since bootstrapper is in the monorepo now, but maybe add a comment from where this value comes from to give more context

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to main branch now that the 3 projects are there

Comment thread deps/compose.template

override_state:
image: {{ IMAGE_REPOSITORY }}anvil:${ANVIL_VERSION}
image: {{ IMAGE_REPOSITORY }}helper:${HELPER_VERSION}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also here you could rename the image, or just maybe update the docs explaining what the helper does

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to main branch now that the 3 projects are there

Comment thread deps/madara/Dockerfile Outdated

RUN echo Cloning madara from branch ${MADARA_VER}
RUN git clone --branch ${MADARA_VER} --single-branch https://github.com/madara-alliance/madara . && \
ENV MADARA_VER="a99088a96a8126d33fef4fabba76a70032e601cf"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as in the orchestrator image, why is this needed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to main branch now that the 3 projects are there

@ftheirs ftheirs merged commit 8647f74 into main Apr 17, 2025
8 checks passed
@ftheirs ftheirs deleted the ci_docker_images branch April 24, 2025 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants