Skip to content

Switch toxiproxy default image to ghcr.io and update default tag to 2.4.0 #5173

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.

Sign up for GitHub

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

Merged
eddumelendez merged 3 commits into from
Jun 28, 2022
Merged

Switch toxiproxy default image to ghcr.io and update default tag to 2.4.0 #5173

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
172a79b
Switch default image to ghcr.io and update default tag to 2.4.0
gmunozfe Mar 14, 2022
ca0d01f
Merge branch 'master' into switch_ghcr
eddumelendez Jun 27, 2022
2704776
Merge branch 'master' into switch_ghcr
eddumelendez Jun 28, 2022
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
4 changes: 2 additions & 2 deletions modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/
public class ToxiproxyContainer extends GenericContainer<ToxiproxyContainer> {

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy");
private static final String DEFAULT_TAG = "2.1.0";
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy");
Copy link
Copy Markdown
Member

@eddumelendez eddumelendez Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to keep backward compatibility, in this case I would suggest to add a new image name

private static final DockerImageName GHCR_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy");

and add it here

dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, GHCR_IMAGE_NAME);

private static final String DEFAULT_TAG = "2.4.0";
private static final int TOXIPROXY_CONTROL_PORT = 8474;
private static final int FIRST_PROXIED_PORT = 8666;
private static final int LAST_PROXIED_PORT = 8666 + 31;
Expand Down