Skip to content

Commit

Permalink
chore: standardize on "Containerfile" for use with podman
Browse files Browse the repository at this point in the history
Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
  • Loading branch information
jpower432 committed Nov 29, 2023
1 parent 3bb6a87 commit ab9a4e9
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ For this guide, we will be using `podman` to test trestlebot in a running contai
1. Build the image

```bash
podman build -f Dockerfile -t localhost:5000/trestlebot:latest
podman build -t localhost:5000/trestlebot:latest
```

2. Create an environment variables file if testing with the entrypoint script.
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The `create-cd` action can be used to create a new [OSCAL Component Definition](
Build and run the container locally:

```bash
podman build -f Dockerfile -t trestle-bot .
podman build -t trestle-bot .
podman run -v $(pwd):/data -w /data trestle-bot
```

Expand Down
2 changes: 1 addition & 1 deletion actions/autosync/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ outputs:

runs:
using: "docker"
image: "../../Dockerfile"
image: "../../Containerfile"
entrypoint: "/auto-sync-entrypoint.sh"
env:
GITHUB_TOKEN: ${{ inputs.github_token }}
Expand Down
2 changes: 1 addition & 1 deletion actions/create-cd/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ outputs:

runs:
using: "docker"
image: "../../Dockerfile"
image: "../../Containerfile"
entrypoint: "/create-cd-entrypoint.sh"
env:
GITHUB_TOKEN: ${{ inputs.github_token }}
Expand Down
2 changes: 1 addition & 1 deletion actions/rules-transform/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ outputs:

runs:
using: "docker"
image: "../../Dockerfile"
image: "../../Containerfile"
entrypoint: "/rules-transform-entrypoint.sh"
env:
GITHUB_TOKEN: ${{ inputs.github_token }}
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Before running the end-to-end tests, ensure you have the following prerequisites

- **`mappings`**: This directory contains JSON mappings used with WireMock to mock the Git server endpoints.
- **`play-kube.yml`**: This file includes Kubernetes resources for deploying the mock API server in a pod.
- **`Dockerfile`**: The Dockerfile used to build the mock server container image.
- **`Containerfile`**: The Containerfile used to build the mock server container image.

## Running the Tests

Expand Down Expand Up @@ -47,8 +47,8 @@ To run the end-to-end tests, follow these steps:
- If the images are not already built, the `make test-e2e` command will build them automatically and remove them at the end of the test. If not, you can build them manually with the following command from the root of the project directory:

```bash
podman build -t localhost/mock-server:latest -f tests/e2e/Dockerfile tests/e2e
podman build -t localhost/trestlebot:latest -f Dockerfile .
podman build -t localhost/mock-server:latest -f tests/e2e/Containerfile tests/e2e
podman build -t localhost/trestlebot:latest .
```

## Future Improvements
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/test_e2e.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
mock_server_image_name = "localhost/mock-server:latest"
pod_name = "trestlebot-e2e-pod"
e2e_context = "tests/e2e"
container_file = "Dockerfile"
container_file = "Containerfile"

test_prof = "simplified_nist_profile"
test_filter_prof = "simplified_filter_profile"
Expand Down

0 comments on commit ab9a4e9

Please sign in to comment.