Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions CI/git_cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
# DM23-2165
# </legal>


docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
git -c safe.directory='*' clean -dfx
>[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
git -c safe.directory='*' clean -dfx
33 changes: 16 additions & 17 deletions CI/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,19 @@
#
# DM23-2165
# </legal>


docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
rm junit.basic.xml junit.oss.xml junit.clang.xml ; \
echo cleaned

docker run --rm -v ${PWD}:/host --workdir /host/code/acr/test docker.cc.cert.org/redemption/prereq \
pytest --verbose --junit-xml=junit.basic.xml ; \
echo basic pytest done

docker run --rm -v ${PWD}:/host --workdir /host/code/acr/test/ast docker.cc.cert.org/redemption/prereq \
pytest --verbose --junit-xml=junit.clang.xml -s ast_comparer.py --config scenarios.json ; \
echo clang pytest done

docker run --rm -v ${PWD}:/host --workdir /host/data/test docker.cc.cert.org/redemption/test \
pytest --verbose --junit-xml=junit.oss.xml ; \
echo oss pytest done
>[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
rm junit.basic.xml junit.oss.xml junit.clang.xml
echo cleaned
>[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host/code/acr/test docker.cc.cert.org/redemption/prereq \
pytest --verbose --junit-xml=junit.basic.xml
echo basic pytest done
>[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host/code/acr/test/ast docker.cc.cert.org/redemption/prereq \
pytest --verbose --junit-xml=junit.clang.xml -s ast_comparer.py --config scenarios.json
echo clang pytest done
[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host/data/test docker.cc.cert.org/redemption/test \
pytest --verbose --junit-xml=junit.oss.xml
echo oss pytest done
15 changes: 8 additions & 7 deletions CI/update_markings_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
# DM23-2165
# </legal>


docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
rm junit.markings.xml ; \
echo cleaned
docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
pytest --junit-xml=junit.markings.xml -v update_markings.py ; \
echo markings pytest done
>[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
rm junit.markings.xml
echo cleaned
>[!WARNING]
docker run --rm -v ${PWD}:/host --workdir /host docker.cc.cert.org/redemption/prereq \
pytest --junit-xml=junit.markings.xml -v update_markings.py
echo markings pytest done
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ docker run -it --rm docker.cc.cert.org/redemption/distrib bash

Note that this container contains the entire Redemption code...this is useful if you intend to run Redemption, but have no plans to modify or tweak the code. If you plan to modify the code, use the `prereq` container instead:

> [!WARNING]
```sh
docker run -it --rm -v ${PWD}:/host -w /host docker.cc.cert.org/redemption/prereq bash
```
Expand All @@ -102,6 +103,7 @@ There is a `test` Docker container that you can build and test with. It builds `

```sh
docker build -f Dockerfile.test -t docker.cc.cert.org/redemption/test .
> [!WARNING]
docker run -it --rm -v ${PWD}:/host -w /host docker.cc.cert.org/redemption/test bash
```

Expand Down Expand Up @@ -235,7 +237,7 @@ bear -- make

To enable the Redemption container to run repairs on your local code directories, you should volume-share them with `-v` when you launch the container. For example, to volume-share a local directory `/code`:

`docker run -it --rm -v /code:/myCode docker.cc.cert.org/redemption/distrib bash`
`docker run -it --rm -v /<host_dir>:/host/host_code docker.cc.cert.org/redemption/distrib bash`

See https://docs.docker.com/storage/volumes/ for more information on volume-sharing.
See https://docs.docker.com/reference/cli/docker/container/run/ for more information about options using the `docker run` command.
Expand Down
2 changes: 2 additions & 0 deletions data/README.dataset.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,13 @@ First, build both Docker containers. Then run the first one.

``` shell
docker build -f Dockerfile.rosecheckers -t data_container .
> [!WARNING]
docker run -it --rm -v ${PWD}:/host -v ${PWD}/datasets:/datasets -w /host data_container bash
```

``` shell
docker build -f Dockerfile.redemption -t clang_tidy_data_container .
> [!WARNING]
docker run -it --rm -v ${PWD}:/host -v ${PWD}/datasets:/datasets -w /host clang_tidy_data_container bash
```

Expand Down
1 change: 1 addition & 0 deletions doc/examples/codebase/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ You can try to repair other codebases, or other versions of the `dos2unix` codeb

For the rest of these instructions, you should execute the commands inside the `distrib` Docker container, and `cd` into this directory. To set this up, run this command in the top-level Redemption directory:

> [!WARNING]
``` sh
docker run -it --rm -v ${PWD}:/host docker.cc.cert.org/redemption/distrib bash
```
Expand Down
1 change: 1 addition & 0 deletions doc/regression_tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ There is also a `test` Docker container that you can build and test with. It bui

```sh
docker build -f Dockerfile.test -t docker.cc.cert.org/redemption/test .
> [!WARNING]
docker run -it --rm -v ${PWD}:/host -w /host docker.cc.cert.org/redemption/test bash
```

Expand Down