Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add yq to build image #7338

Merged
merged 2 commits into from
Jul 19, 2024
Merged

fix: add yq to build image #7338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37ff870
Make sysbox earthfile compatible.
charlielye Jul 4, 2024
fe75647
Fix, readd yq.
charlielye Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions build-images/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ build:
&& mv wasmtime-v20.0.2-$(uname -m)-linux/wasmtime /usr/local/bin \
&& rm -rf wasmtime*

# Install yq
RUN curl -sL https://github.com/mikefarah/yq/releases/download/v4.42.1/yq_linux_$(dpkg --print-architecture) \
-o /usr/local/bin/yq && chmod +x /usr/local/bin/yq

ARG TARGETARCH
SAVE IMAGE --push aztecprotocol/build:1.0-$TARGETARCH

Expand Down Expand Up @@ -387,7 +391,7 @@ sysbox:
e2scrub_reap.service

# Make use of stopsignal (instead of sigterm) to stop systemd containers.
STOPSIGNAL SIGRTMIN+3
Copy link
Collaborator

Choose a reason for hiding this comment

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

if we are commenting this out, should we remove this entirely?

#STOPSIGNAL SIGRTMIN+3

# Set systemd as entrypoint.
ENTRYPOINT [ "/sbin/init", "--log-level=err" ]
Expand All @@ -398,7 +402,7 @@ sysbox:
RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh \
# Add user "ubuntu" to the Docker group
&& usermod -a -G docker ubuntu
ADD https://raw.githubusercontent.com/docker/docker-ce/master/components/cli/contrib/completion/bash/docker /etc/bash_completion.d/docker.sh
RUN curl -fsSL https://raw.githubusercontent.com/docker/docker-ce/master/components/cli/contrib/completion/bash/docker -o /etc/bash_completion.d/docker.sh

# Install sshd.
RUN apt install --no-install-recommends -y openssh-server \
Expand Down
15 changes: 13 additions & 2 deletions build-images/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,19 @@ $ earthly +devbox
```

This will take significant time and compute however, as it builds several toolchains from the ground up.
If you have a reasonable internet connection, leveraging the cache to avoid building maybe prefereable.
If you have a reasonable internet connection, leveraging the cache to avoid building maybe preferable.

```
$ earthly --use-inline-cache +devbox
```
```

### Building the sysbox

The sysbox is the image that internal aztec engineers run on the mainframe. A mainframe administrator can run:

```
$ earthly +sysbox
```

This will rebuild the sysbox image, and once users perform a `sudo halt` their box should reboot with the new image.
If the image tag changes, you'll need to update it in `/usr/local/bin/launch_sysbox`.
Loading