Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[issue:1303] Drop usage of unavailable docker image out of tests #1306

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void shouldStartNoneDeployableContainersWithRegisteredNetwork() {
+
"pingpong:\n"
+
" image: jonmorehouse/ping-pong\n"
" image: hashicorp/http-echo\n"
+
" exposedPorts: [8080/tcp]\n"
+
Expand Down Expand Up @@ -78,7 +78,7 @@ public void shouldNotStartManualContainers() {
+
"pingpong:\n"
+
" image: jonmorehouse/ping-pong\n"
" image: hashicorp/http-echo\n"
+
" exposedPorts: [8080/tcp]\n"
+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void shouldChangeNamesInParallelizeStarCubes() {
" links:\n" +
" - ping*\n" +
"ping*:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand Down Expand Up @@ -229,7 +229,7 @@ public void shouldAddEnvVarsWithHostNameInParallelizeStarCubes() {
" links:\n" +
" - ping*\n" +
"ping*:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand Down Expand Up @@ -260,7 +260,7 @@ public void shouldChangePortBindingToPrivatePortsInParallelizeStarCubes() {
" links:\n" +
" - ping*\n" +
"ping*:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand Down Expand Up @@ -290,7 +290,7 @@ public void shouldChangeStarLinksInParallelizeStarCubes() {
" links:\n" +
" - ping*\n" +
"ping*:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand Down Expand Up @@ -321,7 +321,7 @@ public void shouldParallelizeStarCubesUsingRemappingAlias() {
" links:\n" +
" - ping*:bb\n" +
"ping*:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand Down Expand Up @@ -361,7 +361,7 @@ public void shouldParallelizeNetworks() {
" image: tutum/tomcat:8.0\n" +
" networkMode: network3*\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" networks:\n" +
" - network1*\n" +
" - network2\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void should_not_remove_docker_image_as_not_built_by_cube() {
DockerClientExecutor executor = Mockito.mock(DockerClientExecutor.class);

String config = "pingpong:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8080/tcp]\n" +
" portBindings: [8080->8080/tcp]\n";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void should_resolve_single_bind_port() {
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand All @@ -42,7 +42,7 @@ public void should_throw_exception_with_resolve_two_bind_port() {
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" exposedPorts: [8089/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand All @@ -63,7 +63,7 @@ public void should_throw_exception_with_resolve_two_bind_port_from_different_con
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" portBindings: [8081/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand All @@ -84,7 +84,7 @@ public void should_resolve_two_bind_port_from_different_containers_with_exclusio
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" portBindings: [8081/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand All @@ -106,7 +106,7 @@ public void should_resolve_two_bind_port_from_different_containers_with_exposed_
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" portBindings: [8081/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand All @@ -128,7 +128,7 @@ public void should_throw_exception_when_resolve_two_bind_port_from_different_con
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" portBindings: [8080/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand All @@ -149,7 +149,7 @@ public void should_resolve_two_bind_port_from_different_containers_with_exposed_
" links:\n" +
" - ping\n" +
"ping:\n" +
" image: jonmorehouse/ping-pong\n" +
" image: hashicorp/http-echo\n" +
" portBindings: [8081/tcp]\n" +
"storage:\n" +
" image: tutum/mongodb";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
pingpong:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
networks:
Expand All @@ -13,4 +13,4 @@ networks:
front:
driver: bridge
back:
driver: bridge
driver: bridge
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ public class PingPongIT {

@DockerContainer
Container pingpong = Container.withContainerName("pingpong")
.fromImage("jonmorehouse/ping-pong")
.fromImage("hashicorp/http-echo")
.withPortBinding(8080)
.withCommand("-listen=:8080", "-text=OK")
.build();

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ public class PingPongContainer {
@CubeDockerFile
public static Archive<?> createContainer() {
String dockerDescriptor = Descriptors.create(DockerDescriptor.class)
.from("jonmorehouse/ping-pong")
.from("hashicorp/http-echo")
.expose(8080)
.cmd("-listen=:8080")
.exportAsString();
return ShrinkWrap.create(GenericArchive.class)
.add(new StringAsset(dockerDescriptor), "Dockerfile");
Expand Down
6 changes: 3 additions & 3 deletions docker/ftest-docker-machine-network/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
pingpong:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
networks:
Expand All @@ -16,7 +16,7 @@ services:
back:

pingpong2:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
expose:
- "8080"
networks:
Expand All @@ -39,4 +39,4 @@ networks:
- subnet: 172.16.238.0/24
gateway: 172.16.238.1
- subnet: 2001:3984:3989::/64
gateway: 2001:3984:3989::1
gateway: 2001:3984:3989::1
2 changes: 1 addition & 1 deletion docker/ftest-docker-machine/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ tomcat:
- pingpong:pingpong

pingpong:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
2 changes: 1 addition & 1 deletion docker/ftest-reporter/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pingpong:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
2 changes: 1 addition & 1 deletion docker/ftest-restassured/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
helloworld:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<property name="definitionFormat">CUBE</property>
<property name="dockerContainers">
pingpong:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
exposedPorts: [8080/tcp]
portBindings: [80->8080/tcp]
cmd: [-text=OK, -listen=:8080]
</property>
</extension>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pingpong*:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
- "8080:8080"
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pingpong*:
image: jonmorehouse/ping-pong:${PING_PONG_VERSION:-latest}
image: hashicorp/http-echo:${ECHO_VERSION:-latest}
exposedPorts: [8080/tcp]
portBindings: [8080/tcp]
cmd: [-text=OK, -listen=:8080]
2 changes: 1 addition & 1 deletion docker/ftest-system-properties/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
helloworld:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
ports:
- "8080:8080"
4 changes: 2 additions & 2 deletions docs/cop.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public class PingPongContainer {

@CubeDockerFile // <1>
public static Archive<?> createContainer() { // <2>
String dockerDescriptor = Descriptors.create(DockerDescriptor.class).from("jonmorehouse/ping-pong").exportAsString();
String dockerDescriptor = Descriptors.create(DockerDescriptor.class).from("hashicorp/http-echo").exportAsString();
return ShrinkWrap.create(GenericArchive.class)
.add(new StringAsset(dockerDescriptor), "Dockerfile"); // <3>
}
Expand Down Expand Up @@ -288,7 +288,7 @@ Let's see how to use it following the previous Ping Pong example.
----
@DockerContainer // <1>
Container pingpong = Container.withContainerName("pingpong") // <2>
.fromImage("jonmorehouse/ping-pong")
.fromImage("hashicorp/http-echo")
.withPortBinding(8080)
.build();

Expand Down
10 changes: 5 additions & 5 deletions docs/parallel.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Let's see an example:
links:
- ping*
ping*:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
exposedPorts: [8089/tcp]
pong*:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
exposedPorts: [8089/tcp]
depends_on:
- "ping*"
Expand Down Expand Up @@ -61,10 +61,10 @@ So for example the result file could look like:
links:
- ping_123456
ping_123456:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
exposedPorts: [8089/tcp]
pong_123456:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
exposedPorts: [8089/tcp]
depends_on:
- "ping_123456"
Expand All @@ -89,7 +89,7 @@ Again, adding the special character `*` to the end of the network name will caus
portBindings: [8080/tcp]
networkMode: testnetwork*
ping*:
image: jonmorehouse/ping-pong
image: hashicorp/http-echo
exposedPorts: [8089/tcp]
networks:
- testnetwork*
Expand Down
2 changes: 1 addition & 1 deletion docs/restassured.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ With next docker compose file which starts a ping pong server listening at root
.docker-compose.yml
----
helloworld:
image: jonmorehouse/ping-pong
image: ./docs/restassured.adoc
ports:
- "5000:8080"
----
Expand Down