Skip to content

Commit

Permalink
Merge branch 'pw-support'
Browse files Browse the repository at this point in the history
Closes #26.
  • Loading branch information
mbr committed Jan 6, 2024
2 parents 8a31eb9 + b0ec6f6 commit 4bb766e
Show file tree
Hide file tree
Showing 10 changed files with 708 additions and 307 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hex = "0.4.3"
itertools = "0.12.0"
nom = "7.1.3"
reqwest = { version = "0.11.23", default-features = false }
sec = { version = "1.0.0", features = ["deserialize"] }
sec = { version = "1.0.0", features = [ "deserialize", "serialize" ] }
serde = { version = "1.0.193", features = [ "derive" ] }
serde_json = "1.0.108"
sha2 = "0.10.8"
Expand Down
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# rockslide

## Container runtime configuration

```
curl -u :devpw localhost:3000/_rockslide/config/foo/bar/prod > foobarprod.toml
curl -v -X PUT -u :devpw localhost:3000/_rockslide/config/foo/bar/prod --data-binar
y "@foobarprod.toml"
```

## macOS suppport

macOS is supported as a tier 2 platform to develop rockslide itself, although currently completely untested for production use. [podman can run on Mac OS X](https://podman.io/docs/installation), where it will launch a Linux virtual machine to run containers. The `rockslide` application itself and its supporting nix-derivation all account for being built on macOS.
Expand All @@ -21,4 +29,4 @@ podman run -it debian:latest /bin/sh -c 'echo everything is working fine'

`rockslide` will check an envvar `PODMAN_IS_REMOTE`, if it is `true`, it will assume a remote instance and act accordingly. This envvar is set to `true` automatically when running `nix-shell` on a macOS machine.

With these prerequisites fulfilled, `rockslide` should operate normally as it does on Linux.
With these prerequisites fulfilled, `rockslide` should operate normally as it does on Linux.
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use sec::Secret;
use serde::Deserialize;

use crate::{
podman_is_remote,
podman::podman_is_remote,
registry::{AuthProvider, UnverifiedCredentials},
};

Expand Down
Loading

0 comments on commit 4bb766e

Please sign in to comment.