Skip to content
Merged
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 docs/modules/nginx.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ Nginx is a web server, reverse proxy and mail proxy and http cache.
The following example shows how to start Nginx.

<!--codeinclude-->
[Creating a Nginx container](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:creatingContainer
[Creating a Nginx container](../../modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java) inside_block:creatingContainer
<!--/codeinclude-->

How to add custom content to the Nginx server.

<!--codeinclude-->
[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:addCustomContent
[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java) inside_block:addCustomContent
<!--/codeinclude-->

And how to query the Nginx server for the custom content added.

<!--codeinclude-->
[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/junit/SimpleNginxTest.java) inside_block:getFromNginxServer
[Creating the static content to serve](../../modules/nginx/src/test/java/org/testcontainers/nginx/NginxContainerTest.java) inside_block:getFromNginxServer
<!--/codeinclude-->

## Adding this module to your project dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
import java.net.URL;
import java.util.Set;

/**
* @deprecated use {@link org.testcontainers.nginx.NginxContainer} instead.
*/
@Deprecated
public class NginxContainer extends GenericContainer<NginxContainer> {

private static final int NGINX_DEFAULT_PORT = 80;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package org.testcontainers.nginx;

import org.testcontainers.containers.GenericContainer;
import org.testcontainers.utility.DockerImageName;

import java.net.MalformedURLException;
import java.net.URL;

public class NginxContainer extends GenericContainer<NginxContainer> {

private static final int NGINX_DEFAULT_PORT = 80;

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx");

public NginxContainer(String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}

public NginxContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);

addExposedPort(NGINX_DEFAULT_PORT);
setCommand("nginx", "-g", "daemon off;");
}

public URL getBaseUrl(String scheme, int port) throws MalformedURLException {
return new URL(scheme + "://" + getHost() + ":" + getMappedPort(port));
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.testcontainers.junit;
package org.testcontainers.nginx;

import lombok.Cleanup;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.NginxContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
Expand All @@ -19,7 +18,7 @@

import static org.assertj.core.api.Assertions.assertThat;

class SimpleNginxTest {
class NginxContainerTest {

private static final DockerImageName NGINX_IMAGE = DockerImageName.parse("nginx:1.27.0-alpine3.19-slim");

Expand Down
Loading