aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJohannes Stoelp <johannes.stoelp@gmail.com>2023-11-21 00:28:03 +0100
committerJohannes Stoelp <johannes.stoelp@gmail.com>2023-11-21 00:28:03 +0100
commit4e3898b34a5dbcfabbcf861998d915c261831b60 (patch)
treebf41be059bdb96c38cfacc5761f8b2631c494f23
parent105089e17aa19b326f6d0fd00b00edd9e3ad5564 (diff)
downloadllvm-kaleidoscope-rs-main.tar.gz
llvm-kaleidoscope-rs-main.zip
add comment to either use podman or dockerHEADmain
-rw-r--r--README.md14
-rw-r--r--container/Dockerfile (renamed from docker/Dockerfile)0
-rw-r--r--container/Makefile5
-rw-r--r--docker/Makefile2
4 files changed, 17 insertions, 4 deletions
diff --git a/README.md b/README.md
index 9bd0eda..55eec94 100644
--- a/README.md
+++ b/README.md
@@ -61,16 +61,26 @@ Rustdoc for this crate is available at
## Build with provided container file
-The provided [Dockerfile](docker/Dockerfile) documents the required
+The provided [Dockerfile](container/Dockerfile) documents the required
dependencies for an ubuntu based system and serves as a build environment with
the correct llvm version as specified in the [Cargo.toml](Cargo.toml) file.
```bash
+## Either user podman ..
+
# Build the image *ks-rs*. Depending on the downlink this may take some minutes.
-make -C docker
+make -C container
podman run --rm -it -v $PWD:/work -w /work ks-rs
# Drops into a shell in the container, just use cargo build / run ...
+
+## .. or docker.
+
+# Build the image *ks-rs*. Depending on the downlink this may take some minutes.
+make -C container docker
+
+docker run --rm -it -v $PWD:/work -w /work ks-rs
+# Drops into a shell in the container, just use cargo build / run ...
```
## License
diff --git a/docker/Dockerfile b/container/Dockerfile
index 9cb8b44..9cb8b44 100644
--- a/docker/Dockerfile
+++ b/container/Dockerfile
diff --git a/container/Makefile b/container/Makefile
new file mode 100644
index 0000000..26f7493
--- /dev/null
+++ b/container/Makefile
@@ -0,0 +1,5 @@
+podman: build-podman
+docker: build-docker
+
+build-%:
+ $* build -t ks-rs .
diff --git a/docker/Makefile b/docker/Makefile
deleted file mode 100644
index 6b3ef8b..0000000
--- a/docker/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-build:
- podman build -t ks-rs .