Skip to content

Log which image is being pulled #58

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
whummer merged 1 commit into from
Jun 10, 2021
Merged

Log which image is being pulled #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ You can configure the Docker behaviour using the `@LocalstackDockerProperties` a
| `portElasticSearch` | Port number for the elasticsearch service | String | `4571` |
| `hostNameResolver` | Used for determining the host name of the machine running the docker containers so that the containers can be addressed. | IHostNameResolver | `localhost` |
| `environmentVariableProvider` | Used for injecting environment variables into the container. | IEnvironmentVariableProvider | Empty Map |
| `bindMountProvider | Used bind mounting files and directories into the container, useful to run init scripts before using the container. | IBindMountProvider | Empty Map |
| initializationToken | Give a regex that will be searched in the logstream of the container, start is complete only when the token is found. Use with bindMountProvider to execute init scripts. | String | Empty String |
| `bindMountProvider` | Used bind mounting files and directories into the container, useful to run init scripts before using the container. | IBindMountProvider | Empty Map |
| `initializationToken` | Give a regex that will be searched in the logstream of the container, start is complete only when the token is found. Use with bindMountProvider to execute init scripts. | String | Empty String |
| `useSingleDockerContainer` | Whether a singleton container should be used by all test classes. | boolean | `false` |

For more details, please refer to the README of the main LocalStack repo: https://github.com/localstack/localstack
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/cloud/localstack/docker/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static Container createLocalstackContainer(
+ ":" + LOCALSTACK_PORT_ELASTICSEARCH;

if(pullNewImage || !imageExists) {
LOG.info("Pulling latest image...");
LOG.info(String.format("Pulling image %s", fullImageName));
new PullCommand(imageNameOrDefault, imageTag).execute();
}

Expand All @@ -84,15 +84,15 @@ public static Container createLocalstackContainer(
.withExposedPorts(fullPortElasticSearch, randomizePorts)
.withEnvironmentVariable(LOCALSTACK_EXTERNAL_HOSTNAME, externalHostName)
.withEnvironmentVariable(ENV_DEBUG, ENV_DEBUG_DEFAULT)
.withEnvironmentVariable(ENV_USE_SSL, Localstack.INSTANCE.useSSL() ? "1" : "0")
.withEnvironmentVariable(ENV_USE_SSL, Localstack.useSSL() ? "1" : "0")
.withEnvironmentVariables(environmentVariables)
.withBindMountedVolumes(bindMounts);

if(!StringUtils.isEmpty(platform))
runCommand = runCommand.withPlatform(platform);

for (Integer port : portMappings.keySet()) {
runCommand = runCommand.withExposedPorts("" + port, false);
runCommand = runCommand.withExposedPorts(String.valueOf(port), false);
}
String containerId = runCommand.execute();
LOG.info("Started container: " + containerId);
Expand Down