diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6a48ae..ac027dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,4 +20,4 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 - name: Create jail - run: sudo python3 -m macosjail jail + run: sudo python3 -m darwinjail jail diff --git a/.github/workflows/publish-images.yml b/.github/workflows/publish-images.yml index 9fc3ee7..4415766 100644 --- a/.github/workflows/publish-images.yml +++ b/.github/workflows/publish-images.yml @@ -18,6 +18,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 - run: brew install crane - - run: sudo python3 -m macosjail jail_dir + - run: sudo python3 -m darwinjail jail_dir - run: sudo crane auth login ghcr.io -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}" - - run: sudo bash -c 'crane append --oci-empty-base -t "ghcr.io/macoscontainers/macos-jail/${{ matrix.name }}:latest" -f <(tar -f - -c -C jail_dir .)' + - run: sudo bash -c 'crane append --oci-empty-base -t "ghcr.io/darwin-containers/darwin-jail/${{ matrix.name }}:latest" -f <(tar -f - -c -C jail_dir .)' diff --git a/README.md b/README.md index ae67acc..7216de3 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,10 @@ -# macos-jail +# darwin-jail -[![Build Status](https://github.com/macOScontainers/macos-jail/workflows/CI/badge.svg?branch=main)](https://github.com/macOScontainers/macos-jail/actions?query=branch:main) - -> **Note** -> Artifacts published in this repo contain software covered by [macOS EULA](https://www.apple.com/legal/sla/) and are only intended to be run on Apple hardware. +[![Build Status](https://github.com/darwin-containers/darwin-jail/workflows/CI/badge.svg?branch=main)](https://github.com/darwin-containers/darwin-jail/actions?query=branch:main) ## Prerequisites -* MacOS Ventura or newer +* macOS Ventura or newer * Disable [System Identity Protection](https://developer.apple.com/documentation/security/disabling_and_enabling_system_integrity_protection). SIP [doesn't allow](https://github.com/containerd/containerd/discussions/5525#discussioncomment-2685649) to `chroot` (not needed for building though). @@ -15,7 +12,7 @@ SIP [doesn't allow](https://github.com/containerd/containerd/discussions/5525#di ```shell cd "$repo_root" -sudo python3 -m macosjail "$jail_dir" # prepare chroot dir contents +sudo python3 -m darwinjail "$jail_dir" # prepare chroot dir contents sudo chroot "$jail_dir" # enter chroot ``` @@ -26,7 +23,7 @@ sudo mkdir -p "$jail_dir/var/run" sudo link -f /var/run/mDNSResponder "$jail_dir/var/run/mDNSResponder" ``` -## Uploading macOS rootfs as Docker image +## Uploading Darwin rootfs as Docker image ```shell brew install crane @@ -37,4 +34,4 @@ brew install crane sudo bash -c 'crane append --oci-empty-base -t "$image_tag" -f <(tar -f - -c -C "$jail_dir" .)' ``` -If you want to run macOS image using containerd or Docker, see [instructions](https://github.com/macOScontainers/homebrew-formula#macos-native-containers). +If you want to run Darwin image using containerd or Docker, see [instructions](https://github.com/darwin-containers/homebrew-formula#darwin-native-containers). diff --git a/macosjail/__init__.py b/darwinjail/__init__.py similarity index 100% rename from macosjail/__init__.py rename to darwinjail/__init__.py diff --git a/macosjail/__main__.py b/darwinjail/__main__.py similarity index 52% rename from macosjail/__main__.py rename to darwinjail/__main__.py index 97aa428..70b8042 100644 --- a/macosjail/__main__.py +++ b/darwinjail/__main__.py @@ -1,4 +1,4 @@ -# This file exists to make `python3 -m macosjail` work +# This file exists to make `python3 -m darwinjail` work from .main import main diff --git a/macosjail/main.py b/darwinjail/main.py similarity index 100% rename from macosjail/main.py rename to darwinjail/main.py diff --git a/macosjail/mkjail.files b/darwinjail/mkjail.files similarity index 100% rename from macosjail/mkjail.files rename to darwinjail/mkjail.files diff --git a/pyproject.toml b/pyproject.toml index ec9745a..4152155 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] -name = "macos-jail" +name = "darwin-jail" version = "0.0.1" -description = "Chroot jail for macOS" +description = "Chroot jail for Darwin" requires-python = ">= 3.8" license = { file = "LICENSE" } readme = "README.md" @@ -17,7 +17,7 @@ requires = [ build-backend = "setuptools.build_meta" [project.scripts] -macos-jail = "macosjail:main" +darwin-jail = "darwinjail:main" [tool.setuptools.package-data] "*" = ["mkjail.files"]