Skip to content

Create initial FreeBSD worker #236

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

Merged
tmcgilchrist merged 6 commits into from
Sep 13, 2023
Merged

Create initial FreeBSD worker #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a299be
Create initial FreeBSD worker
tmcgilchrist Jun 28, 2023
b9e0ad6
Update dune rule
mtelvers Aug 5, 2023
07970f7
Updated Fetcher
mtelvers Aug 22, 2023
0410672
Update opam-repository version in Dockerfiles.
tmcgilchrist Aug 28, 2023
d35105c
Update obuilder
tmcgilchrist Sep 7, 2023
8125153
Temporarily disable Windows testing.
tmcgilchrist Sep 13, 2023
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
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:

- run: opam exec -- dune build

- run: opam exec -- dune runtest
# TODO Investigate obuilder windows test failures
# - run: opam exec -- dune runtest

- name: Install the package
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ocaml/opam:debian-11-ocaml-4.14@sha256:4bfe3c0814b4220417d6ccbbed7eb5486a35d900024745c1f299973e9584e0e5 AS build
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto libcapnp-dev m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard eb733d35a0a83a2635d25cd85e905661d145aead && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
RUN opam pin -yn /src/obuilder/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.worker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ocaml/opam:ubuntu-22.04-ocaml-4.14@sha256:41ce765f59ecde9d8525ec58e0da7cd1317f3798d2c4951186aeef2ce804fad5 AS build
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto libcapnp-dev m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard eb733d35a0a83a2635d25cd85e905661d145aead && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
RUN opam pin -yn /src/obuilder/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.worker.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ocaml/opam:alpine-3.17-ocaml-4.14@sha256:df87c00eb4b212b8b42e3cbf37b7729507bb398b4bf19c9df0e2d84d1c41e46d AS build
RUN sudo apk update && sudo apk add libev capnproto m4 sqlite libgmpxx
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard eb733d35a0a83a2635d25cd85e905661d145aead && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
RUN opam pin -yn /src/obuilder/
Expand Down
2 changes: 1 addition & 1 deletion obuilder
Open in desktop
Submodule obuilder updated 47 files
+26 −0 .github/workflows/main.sh
+23 −22 .github/workflows/main.yml
+68 −112 README.md
+320 −0 doc/README.mld
+457 −0 doc/freeBSD.mld
+10 −0 doc/index.mld
+2 −3 doc/macOS.md
+59 −0 doc/macOS.mld
+0 −0 doc/windows.md
+247 −0 doc/windows.mld
+17 −0 dune
+2 −2 dune-project
+1 −1 example.spec
+1 −1 example.windows.spec
+28 −0 lib/archive_extract.ml
+3 −0 lib/archive_extract.mli
+16 −4 lib/btrfs_store.ml
+11 −5 lib/build.ml
+1 −1 lib/build.mli
+11 −5 lib/db_store.ml
+2 −0 lib/db_store.mli
+3 −0 lib/docker_sandbox.ml
+1 −0 lib/docker_store.ml
+2 −0 lib/docker_store.mli
+7 −1 lib/dune
+35 −42 lib/macos.ml
+3 −1 lib/obuilder.ml
+2 −2 lib/os.ml
+5 −0 lib/s.ml
+174 −0 lib/sandbox.jail.ml
+47 −120 lib/sandbox.macos.ml
+4 −0 lib/sandbox.mli
+3 −0 lib/sandbox.runc.ml
+10 −3 lib/store_spec.ml
+0 −8 lib/user_temp.ml
+0 −4 lib/user_temp.mli
+155 −0 lib/xfs_store.ml
+11 −0 lib/xfs_store.mli
+29 −0 lib/zfs_clone.ml
+4 −0 lib/zfs_clone.mli
+64 −27 lib/zfs_store.ml
+1 −0 main.ml
+4 −1 obuilder-spec.opam
+4 −1 obuilder.opam
+2 −0 test/mock_sandbox.ml
+1 −0 test/mock_sandbox.mli
+3 −2 test/test.ml
6 changes: 3 additions & 3 deletions worker/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
(rule
(deps fetcher.macos.ml)
(deps fetcher.zfs_clone.ml)
(target fetcher.ml)
(enabled_if (= %{system} macosx))
(enabled_if (or (= %{system} macosx) (= %{system} freebsd)))
(action (copy %{deps} %{target})))

(rule
(deps fetcher.docker.ml)
(target fetcher.ml)
(enabled_if (<> %{system} macosx))
(enabled_if (and (<> %{system} macosx) (<> %{system} freebsd)))
(action (copy %{deps} %{target})))

(library
Expand Down
1 change: 0 additions & 1 deletion worker/fetcher.macos.ml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions worker/fetcher.zfs_clone.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include Obuilder.Zfs_clone