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

add images to build runtime on FreeBSD #277

Merged
merged 1 commit into from
Apr 3, 2020
Merged

add images to build runtime on FreeBSD #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,30 @@
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/18.04/cross/freebsd/11",
"os": "linux",
"osVersion": "freebsd.11",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"osVersion": "freebsd.11",
"osVersion": "ubuntu18.04",

Copy link
Member Author

Choose a reason for hiding this comment

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

updated. Is there place in manifest to reflect target OS/arch? Or is it only by the tag?

"tags": {
"ubuntu-18.04-cross-freebsd-11-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/18.04/cross/freebsd/12",
"os": "linux",
"osVersion": "freebsd.12",
wfurt marked this conversation as resolved.
Show resolved Hide resolved
"tags": {
"ubuntu-18.04-cross-freebsd-12-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
}
}
]
},
{
"platforms": [
{
Expand Down
5 changes: 5 additions & 0 deletions src/ubuntu/18.04/cross/freebsd/11/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-coredeps

RUN apt -y autoremove

ADD rootfs.x64.tar crossrootfs
3 changes: 3 additions & 0 deletions src/ubuntu/18.04/cross/freebsd/11/hooks/post-build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

rm -rf $PWD/rootfs*.tar
3 changes: 3 additions & 0 deletions src/ubuntu/18.04/cross/freebsd/11/hooks/pre-build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

$(dirname ${BASH_SOURCE[0]})/../../../../../build-scripts/build-rootfs.sh ubuntu-18.04 freebsd11 x64
5 changes: 5 additions & 0 deletions src/ubuntu/18.04/cross/freebsd/12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-coredeps

RUN apt -y autoremove

ADD rootfs.x64.tar crossrootfs
3 changes: 3 additions & 0 deletions src/ubuntu/18.04/cross/freebsd/12/hooks/post-build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

rm -rf $PWD/rootfs*.tar
3 changes: 3 additions & 0 deletions src/ubuntu/18.04/cross/freebsd/12/hooks/pre-build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

$(dirname ${BASH_SOURCE[0]})/../../../../../build-scripts/build-rootfs.sh ubuntu-18.04 freebsd12 x64
7 changes: 6 additions & 1 deletion src/ubuntu/18.04/crossdeps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ RUN apt-get update \
make \
qemu \
qemu-user-static \
libbz2-dev \
wfurt marked this conversation as resolved.
Show resolved Hide resolved
libz-dev \
liblzma-dev \
libarchive-dev \
libbsd-dev \
&& rm -rf /var/lib/apt/lists/*

RUN apt-get update \
Expand All @@ -31,4 +36,4 @@ RUN apt-get update \
llvm-9 \
python-lldb-6.0 \
&& rm -rf /var/lib/apt/lists/*

2 changes: 1 addition & 1 deletion src/ubuntu/build-scripts/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ do

echo "Using $dockerCrossDepsTag to clone arcade to fetch scripts used to build cross-toolset"
docker exec $buildRootFSContainer \
git clone https://github.com/dotnet/arcade /scripts
git clone --depth 1 https://github.com/dotnet/arcade /scripts

if [ $? -ne 0 ]; then
echo "Rootfs build failed: `git clone https://github.com/dotnet/arcade /scripts` returned error"
Expand Down