Skip to content
Snippets Groups Projects
Unverified Commit 5a06d4eb authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'configure-images' of...

Merge branch 'configure-images' of gitlab.phaidra.org:fair-data-austria-db-repository/fda-services into configure-images
parents 35d0696a a23e8917
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,9 @@ target/ ...@@ -18,6 +18,9 @@ target/
# Environment # Environment
.env .env
# macOS
.DS_Store
# IDE # IDE
fda-analyse-service/venv fda-analyse-service/venv
.git.bfg-* .git.bfg-*
......
...@@ -119,6 +119,7 @@ services: ...@@ -119,6 +119,7 @@ services:
METADATA_PASSWORD: ${METADATA_PASSWORD} METADATA_PASSWORD: ${METADATA_PASSWORD}
BROKER_USERNAME: ${BROKER_USERNAME} BROKER_USERNAME: ${BROKER_USERNAME}
BROKER_PASSWORD: ${BROKER_PASSWORD} BROKER_PASSWORD: ${BROKER_PASSWORD}
SHARED_FILESYSTEM: ${SHARED_FILESYSTEM}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
......
...@@ -101,7 +101,6 @@ public class ContainerServiceImpl implements ContainerService { ...@@ -101,7 +101,6 @@ public class ContainerServiceImpl implements ContainerService {
.withHostName(container.getInternalName()) .withHostName(container.getInternalName())
.withEnv(imageMapper.environmentItemsToStringList(image.get().getEnvironment())) .withEnv(imageMapper.environmentItemsToStringList(image.get().getEnvironment()))
.withHostConfig(hostConfig) .withHostConfig(hostConfig)
// .withVolumes(volume)
.exec(); .exec();
} catch (ConflictException e) { } catch (ConflictException e) {
log.error("Conflicting names {}", createDto.getName()); log.error("Conflicting names {}", createDto.getName());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment