Skip to content

Commit

Permalink
remove local redis config
Browse files Browse the repository at this point in the history
  • Loading branch information
volovyks committed Oct 18, 2024
1 parent 596f13b commit 99126b5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/multichain-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: |
docker pull ghcr.io/near/near-lake-indexer:node-2.3.0
docker pull localstack/localstack:3.5.0
docker pull redis:7.2.5
docker pull redis:7.0.15
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Running integration tests requires you to have relayer and sandbox docker images
```BASH
docker pull ghcr.io/near/os-relayer
docker pull ghcr.io/near/sandbox
docker pull redis:7.2.5
docker pull redis:7.0.15
```

For M1 you may want to pull the following image instead:
Expand Down
17 changes: 3 additions & 14 deletions integration-tests/chain-signatures/src/containers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -631,26 +631,15 @@ pub struct Redis<'a> {

impl<'a> Redis<'a> {
pub const CONTAINER_PORT: u16 = 6379;
pub const HOST_CONFIG_PATH: &'static str = "./redis.conf";
pub const CONTAINER_CONFIG_PATH: &'static str = "/usr/local/etc/redis/redis.conf";

pub async fn run(docker_client: &'a DockerClient, network: &str) -> anyhow::Result<Redis<'a>> {
tracing::info!("Running Redis container...");

let image = GenericImage::new("redis", "7.2.5")
let image = GenericImage::new("redis", "7.0.15")
.with_wait_for(WaitFor::message_on_stdout("Ready to accept connections"))
.with_exposed_port(Self::CONTAINER_PORT)
.with_volume(Self::HOST_CONFIG_PATH, Self::CONTAINER_CONFIG_PATH);
.with_exposed_port(Self::CONTAINER_PORT);

// Pass the config file to Redis on startup
let image: RunnableImage<GenericImage> = (
image,
vec![
"redis-server".to_string(),
Self::CONTAINER_CONFIG_PATH.to_string(),
],
)
.into();
let image: RunnableImage<GenericImage> = (image).into();

let image = image.with_network(network);

Expand Down

0 comments on commit 99126b5

Please sign in to comment.