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

Jump to bottom

chore: fix devbox #6214

Closed
wants to merge 4 commits into from
Closed

chore: fix devbox #6214

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14c97e9
fix: pass foundry tag into devbox build
TomAFrench May 4, 2024
54bc5fa
chore: replace `ubuntu` user with `aztec-dev`
TomAFrench May 4, 2024
a1bac83
chore: add build arg to devcontainer.json
TomAFrench May 4, 2024
59bd84d
Update build-images/Makefile
TomAFrench May 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
10 changes: 8 additions & 2 deletions .devcontainer/dev/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"build": {
"dockerfile": "../../build-images/Dockerfile",
"context": "../../build-images",
"target": "devbox"
"target": "devbox",
"args": {
// See `FOUNDRY_TAG` in `../../build-images/Makefile`
"TAG": "de33b6af53005037b463318d2628b5cfcaf39916"
}
},
"containerUser": "aztec-dev",
// ubuntu:noble is currently not supported.
Expand All @@ -18,5 +22,7 @@
// "dockerDashComposeVersion": "v1"
// }
// },
"mounts": ["source=devbox-home,target=/home/aztec-dev,type=volume"]
"mounts": [
"source=devbox-home,target=/home/aztec-dev,type=volume"
]
}
4 changes: 2 additions & 2 deletions build-images/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ if mount | grep -q /host_mark/Users; then
fi
' >> /etc/zsh/zshrc
EOF
# Create the user we'll run as and become the user.
RUN useradd --shell /bin/zsh -G sudo -m aztec-dev
# Create the user we'll run as and become the user (remove ubuntu first).
RUN userdel -r ubuntu && useradd --shell /bin/zsh -G sudo -m aztec-dev
USER aztec-dev
WORKDIR /home/aztec-dev
# Add dotfiles.
Expand Down
6 changes: 3 additions & 3 deletions build-images/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ osxcross:
docker manifest push aztecprotocol/osxcross:14.0

build:
docker build -t aztecprotocol/build:$(ARCH)-$(VERSION) --target build .
docker build -t aztecprotocol/build:$(ARCH)-$(VERSION) --build-arg TAG=${FOUNDRY_TAG} --target build .
docker tag aztecprotocol/build:$(ARCH)-$(VERSION) aztecprotocol/build

build-push: build
Expand All @@ -39,7 +39,7 @@ build-push: build
docker manifest push aztecprotocol/build:$(VERSION)

devbox:
docker build -t aztecprotocol/devbox:$(ARCH)-$(VERSION) --target devbox .
docker build -t aztecprotocol/devbox:$(ARCH)-$(VERSION) --build-arg TAG=${FOUNDRY_TAG} --target devbox .
TomAFrench marked this conversation as resolved.
Show resolved Hide resolved
docker tag aztecprotocol/devbox:$(ARCH)-$(VERSION) aztecprotocol/devbox

devbox-push: devbox
Expand All @@ -51,7 +51,7 @@ devbox-push: devbox
docker manifest push aztecprotocol/devbox:$(VERSION)

sysbox:
docker build -t aztecprotocol/sysbox --target sysbox .
docker build -t aztecprotocol/sysbox --build-arg TAG=${FOUNDRY_TAG} --target sysbox .

all: build devbox sysbox

Expand Down
Loading