Commit Graph
46 Commits
Author SHA1 Message Date
Kathryn BaldaufandGitHub 42528e6c43 Update CONTRIBUTORS to MAINTAINERS and point at containerization (#942)
## Type of Change
- [x] Documentation update

## Motivation and Context
See https://github.com/apple/containerization/pull/435 for more
information on this change.
2025-12-09 10:42:27 -08:00
Kathryn BaldaufandGitHub 7bfdcc9940 Revert "added the new workflow that automatically puts the labels in PR" (#776)
Reverts apple/container#741

The action does not have permissions to add labels. Reverting this while
we investigate the right fix

@Ronitsabhaya75 heads up
2025-10-16 18:08:54 -07:00
Kathryn BaldaufandGitHub 6cb40b3687 Add image env variables to builder start command (#756)
## Type of Change
- [x] Bug fix

## Motivation and Context
Required for builder to run correctly with bug fix in containerization
here https://github.com/apple/containerization/pull/329. Builder was
previously not passing any environment variables when starting the
initial process.

## Testing
- [x] Tested locally

---------

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-10-14 11:13:18 -07:00
Kathryn BaldaufandGitHub 23b058c53c Remove StandardErrorPath and StandardOutPath from launchd plists (#742)
## Type of Change
- [x] Bug fix

## Motivation and Context
We setup logging for the services in `container` using OSLog. See
[here](https://github.com/apple/container/blob/73709232d2705b7008b7380fe90a373059b6074a/Sources/Helpers/APIServer/APIServer.swift#L31).
This makes it unnecessary to redirect stderr and stdio for these
services. Additionally, there are some cases where failure to open or
write to the path given for StandardErrorPath or StandardOutPath in a
service's plist could result in a failure to start a service through
`launchctl`.

Related to https://github.com/apple/container/discussions/713

## Testing
- [x] Tested locally

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-10-08 16:08:08 -07:00
Kathryn BaldaufandGitHub 96ba14bc21 Add warning note on finding docs for release versions (#676)
## Type of Change
- [ ] Bug fix
- [ ] New feature  
- [ ] Breaking change
- [x] Documentation update

## Motivation and Context
Closes https://github.com/apple/container/issues/638. This PR adds a
warning in the README for the documentation links to help newcomers find
the correct documentation based on the version of `container` they are
running.

## Testing
- [ ] Tested locally
- [ ] Added/updated tests
- [x] Added/updated docs

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-23 15:22:58 -07:00
Kathryn BaldaufandGitHub 386fd87b5d Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (#613)
## Type of Change
- [x] Bug fix
- [ ] New feature  
- [ ] Breaking change
- [ ] Documentation update

## Motivation and Context
Fixes https://github.com/apple/container/issues/588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.

## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-16 10:52:08 -07:00
Kathryn BaldaufandGitHub 1b68728629 Update builder shim version to 0.6.1 to support default global args (#605)
## Type of Change
- [x] Dependency update

## Motivation and Context
A change was made in container-builder-shim to support BuildKit's
default global args
https://github.com/apple/container-builder-shim/pull/44. A new tag of
container-builder-shim was made with this change and this PR updates to
that new tag for container-builder-shim.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-12 15:11:49 -07:00
Kathryn BaldaufandGitHub 7bd9e5ac82 Remove description field in PR template (#583)
## Type of Change
- [x] Process update

## Description
Remove description field in PR template 

## Motivation and Context
I think having separate `Description` and `Motivation and Context`
sections have been redundant in recent usage of the PR template. This PR
removes the `Description` section. Ideally the PR title should cover the
same content previously in the `Description` section.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-05 13:54:35 -07:00
Kathryn BaldaufandGitHub 17a1a3e2c7 Allow kernel set with tar to use relative paths to tar file (#582)
## Type of Change
- [x] Bug fix

## Description
Allow kernel set with tar to use relative paths to tar file. Fixes
https://github.com/apple/container/issues/573.

## Motivation and Context
`absoluteString` will prefix a scheme to the file path that looks like
"file://". This will cause file manager to fail to find the file at the
file path even if it exists. Change to instead just get the `path` of
the file, which does not add a scheme prefix.

## Testing
- [x] Tested locally

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-05 11:55:36 -07:00
Kathryn BaldaufandGitHub d6b2243c75 Add force option to kernel set and add tests for kernel setting (#579)
## Type of Change
- [x] New feature  

## Description
Add option to force kernel setting and tests for CLI `kernel set`.
Related to https://github.com/apple/container/pull/575.

## Motivation and Context
This PR adds additional tests to ensure that we can set kernels from
local files, remote tar files, and local tar files. A new option `force`
is added to the `kernel set` subcommand which will overwrite an existing
kernel with the same name if one exists to make testing easier. The
tests ensure that a container can be started with the newly set kernel
and resets to the default recommended kernel when complete.

## Testing
- [x] Tested locally
- [x] Added/updated tests

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-05 11:51:07 -07:00
Kathryn BaldaufandGitHub cb2f424420 Support following symlinks in tar when setting default kernel (#575)
## Type of Change
- [x] Bug fix

## Description
This PR checks if the found entry in the archive for the requested
kernel path is a symlink, and if so, follows the symlink. I've opened a
separate issue to track creating tests for kernel downloading here
https://github.com/apple/container/issues/574 and will create a
follow-up PR for those.

## Motivation and Context
This PR fixes an issue reported in
https://github.com/apple/container/issues/475 where installing a kernel
from a tar archive does not follow symlinks in the archive.

## Testing
- [x] Tested locally

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-09-04 14:10:37 -07:00
Kathryn BaldaufandGitHub 2525d557ef Uninstaller: call usage if incorrect number of options are provided (#556)
This PR improves the user experience when using the uninstall script to
include usage output when an incorrect number of options are provided to
the script.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-08-29 14:19:44 -07:00
Kathryn BaldaufandGitHub c21068661f Native builder parser support for EXPOSE (#465)
Closes https://github.com/apple/container/issues/430

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-08-07 12:17:59 -07:00
Kathryn BaldaufandGitHub d048ea5201 Native builder: remove option token in favor of string literals (#450)
Remove the option token from the dockerfile tokenizer for the native
builder. This cleans up some of the logic around handling options
depending on if they're instruction options or user provided options to
a command.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-08-05 16:33:07 -07:00
Kathryn BaldaufandGitHub 8adb215522 Native Builder: Add parser support for CMD and LABEL instructions (#448)
This PR adds support for CMD and LABEL instructions in the native
builder's parser.

This also changes how options are tokenized. Options now include the raw
string so that when constructing a command for instructions like CMD and
RUN, we can use the exact user input without having to add logic in the
tokenizer to know when we're parsing a command verses other options,
etc.

Closes https://github.com/apple/container/issues/428 and
https://github.com/apple/container/issues/429

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-08-05 14:34:34 -07:00
Kathryn BaldaufandGitHub 16f2630126 Add initial native builder code (#399)
We're working on making a pure swift container image build system that
leverages containerization. This PR represents our initial design and
initial work towards this goal.

The native builder is still in active development and most of the
implementation has not been started or completed. We will be opening a
series of issues that represent various (but not necessarily all) pieces
of work that need to be done here.

There are docs included in this PR that describe the overall design of
each component and outline some of our goals. The easiest way to view
the docs by themselves (since this is a massive PR) is to look at the
docs commit in the `Commits` tab.

We'd love any feedback! 

@wlan0

---------

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-31 13:13:20 -07:00
Kathryn BaldaufandGitHub 047c1afe96 Fix user arg passthrough for container create (#393)
This matches other container commands that rely on user arguments at the
end, such as `container run`. Closes #395.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-29 13:54:12 -07:00
Kathryn BaldaufandGitHub 7dc1dda43f Update xcode developer version to new symlink (#374)
Related to https://github.com/apple/containerization/pull/234

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-25 13:11:29 -07:00
Kathryn BaldaufandGitHub 8002eec249 Add cause string to error message sent with xpc (#361)
Looks like we've been ignoring the "cause" field for
ContainerizationError when sent over xpc. Add the cause to the
`ContainerXPCError` message field instead of a new `cause` field since
`Error` is not encodable. The goal here is just to preserve information.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-21 15:04:28 -07:00
Kathryn BaldaufandGitHub b2e7cb5e87 Add test for using previous stages as FROM source (#342)
Depends on https://github.com/apple/container-builder-shim/pull/38 and a
new builder image tag
Related to https://github.com/apple/container/issues/334

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-16 14:35:29 -07:00
Kathryn BaldaufandGitHub f0d82d2032 Handle when keychain query returns an unhandled error (#331)
Depends on https://github.com/apple/containerization/pull/210
Related to https://github.com/apple/container/issues/254

---------

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-14 14:52:12 -07:00
Kathryn BaldaufandGitHub 20151d89e1 Fix build with local images test (#285)
Related to https://github.com/apple/container/issues/211

DO NOT MERGE until a new tag on container-builder-shim is created

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-07-01 18:22:57 -07:00
Kathryn BaldaufandGitHub 3fcd0dda67 Add version info to package installer (#249)
Fixes https://github.com/apple/container/issues/203

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-27 13:50:37 -07:00
Kathryn BaldaufandGitHub 00aa883a83 Remove use of triage label (#262)
Tags on the repo should be a way to classify an item instead of denoting
workflow or status of the item. Remove the addition of the triage label
on bug and feature issues.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-27 14:07:53 -04:00
Kathryn BaldaufandGitHub e693139ab9 Move github issues to use feature and bug Types instead of Labels (#258)
Github now has a "Type" feature for issues. Types are set at the
organization level and can be used for consistent classification of
issues across an organization. We'd like to switch to using these to
classify if an issue is a bug or feature instead of labels. Labels will
be used for more granular classification within a repo.

See [github
docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/configuring-issues/managing-issue-types-in-an-organization)
for more information about GitHub Issue Types.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-25 16:40:21 -07:00
Kathryn BaldaufandGitHub 4a6a1f15d8 Add test that we replace meta args in builder correctly (#255)
Depends on https://github.com/apple/container-builder-shim/pull/24 

Related to https://github.com/apple/container/issues/252

---------

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-24 13:25:58 -07:00
Kathryn BaldaufandGitHub 157bacf6a4 Make test suites run sequentially with respect to other test suites (#200)
Right now swift testing does not have finer grain test parallelization
controls. As a result our easy options are either to have ALL tests in
ALL test suites run sequentially or have tests within a given test suite
run sequentially while other test suites are run at the same time.

This has been problematic for our CI since we opted for the second
option above, where, for examples, the tests in the builder test suite
run sequentially, but the builder test suite runs at the same time as
the container run test suite. When this happens, a lot of different
tests try to pull the necessary images for testing at the same time,
causing some tests to timeout.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-16 12:38:55 -07:00
Kathryn BaldaufandGitHub a84389e517 Remove editor specific git ignore rules (#197)
These should be up to users to maintain, as trying to add everyones
editor of choice config directories here isn't ideal.

Matches https://github.com/apple/containerization/pull/106

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-13 14:47:16 -07:00
Kathryn BaldaufandGitHub 878ebbda2e Add default year for hawkeye formatting (#180)
This adds a default year to use when a file does not yet have git
attributes (aka for a newly created file).

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-13 09:50:05 -07:00
Kathryn BaldaufandGitHub 6f1f770a4e Remove temporary workaround for image auth to ghcr (#155)
When we were setting up the repos, we needed these environment variables
for the GitHub Actions CI to be able to run the tests. Now that the
images are public, these can be removed.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-12 11:36:42 -07:00
Kathryn BaldaufandGitHub 2ac52d4ce0 Add missing link to repo CoC in issue template (#157)
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-12 11:36:23 -07:00
Kathryn BaldaufandGitHub 3838be5207 Update protos and add builder shim version in Package.swift (#176)
This PR updates the protos to match the recent changes in
https://github.com/apple/container-builder-shim/pull/15.

This PR additionally adds the builder shim version as a variable in
Package.swift. This allows us to be consistent with the builder tag used
for the builder shim image and when building protobuf files.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-12 10:51:00 -07:00
Kathryn BaldaufandGitHub 5f7fe489a6 Add issue templates for bugs and features (#152)
I would love feedback on how people feel about these issue templates, if
there should be more or less templates, or if there are any fields that
people think we should add.

You can see an example of how to use these by testing opening an issue
on my fork [here](https://github.com/katiewasnothere/container/issues).

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-11 17:04:03 -07:00
Kathryn BaldaufandGitHub 37fc68fee0 Add the option to disable progress updates on image CLI calls (#146)
Closes https://github.com/apple/container/issues/126 

This PR additionally removes the ability to set
`disable-progress-updates` for `container create` calls while we
investigate why output get jumbled there.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-11 13:12:10 -07:00
Kathryn BaldaufandGitHub 3a76848e18 Remove unused flags from registry login (#128)
fixes https://github.com/apple/container/issues/120 

These flags were unused, so remove for clarity.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-10 16:08:22 -07:00
Kathryn BaldaufandGitHub 665532c374 Remove use of REPO_READ token (#124)
This token was needed when the repos were private. Now that they are
public, this should no longer be needed.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-10 15:38:19 -07:00
Kathryn BaldaufandGitHub eeddf6f7e7 Publish docs from main (#67)
We eventually only want to support building docs from release branches
and tags, however, while we're working to initially set up the docs, we
may have some churn. So we want to be able to publish from main during
that churn.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-09 16:33:05 -07:00
Kathryn BaldaufandGitHub d4e01c6579 Only allow publishing docs on release branch or tags (#30)
This removes the ability to deploy docs on the main branch and instead
only allows docs deployment on either a tag or a release branch. Docs
are also built (but not deployed) in the common job run by the build and
release pipelines.

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-06 21:49:49 -07:00
Kathryn BaldaufandGitHub 7523d68251 Update to containerization 0.0.3 (#21)
Update containerization to take new breaking changes
https://github.com/apple/containerization/pull/22

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-06 14:39:51 -07:00
Kathryn Baldauf 7e0567cece Fix typo in release branch name (#14)
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-05 15:53:35 -07:00
Kathryn Baldauf 7ce2585531 Add token to allow deploying github pages (#13)
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-05 15:53:24 -07:00
Kathryn Baldauf ec4185fcc7 Publish docs github action (#9)
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-05 15:53:13 -07:00
3a6d7ae676 Cherry pick additional changes (#3)
* Format the codebase (#50)

Signed-off-by: Aditya Ramani <a_ramani@apple.com>

* Update packages before going public (#48)

---------

Signed-off-by: Aditya Ramani <a_ramani@apple.com>
Co-authored-by: Aditya Ramani <a_ramani@apple.com>
Co-authored-by: dkovba <dkovba@apple.com>
2025-06-05 15:52:26 -07:00
Kathryn Baldauf c0fccc0ef6 Update broken test (#2)
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-05 15:52:20 -07:00
Kathryn Baldauf 31a0cb2f4e Update alpine images used (#1)
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
2025-06-05 15:52:13 -07:00
+6 8e9670c8f8 Initial commit
Co-authored-by: Aditya Ramani <a_ramani@apple.com>
Co-authored-by: Agam Dua <agam_dua@apple.com>
Co-authored-by: Danny Canter <danny_canter@apple.com>
Co-authored-by: Dmitry Kovba <dkovba@apple.com>
Co-authored-by: Eric Ernst <eric_ernst@apple.com>
Co-authored-by: Evan Hazlett <ehazlett@apple.com>
Co-authored-by: Gilbert Song <gilbertsong@apple.com>
Co-authored-by: Hugh Bussell <hbussell@apple.com>
Co-authored-by: John Logan <john_logan@apple.com>
Co-authored-by: Kathryn Baldauf <k_baldauf@apple.com>
Co-authored-by: Madhu Venugopal <mvenugopal@apple.com>
Co-authored-by: Michael Crosby <michael_crosby@apple.com>
Co-authored-by: Sidhartha Mani <sidhartha_mani@apple.com>
Co-authored-by: Tanweer Noor <tnoor@apple.com>
Co-authored-by: Ximena Perez Diaz <xperez528@gmail.com>
Co-authored-by: Yibo Zhuang <yzhuang@apple.com>
2025-06-05 15:51:55 -07:00