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.

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

fix(quickstart): update compose spec version #2873

Merged
merged 1 commit into from
Jul 13, 2021
Merged

fix(quickstart): update compose spec version #2873

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
6 changes: 3 additions & 3 deletions docker/docker-compose-without-neo4j.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ services:
kafka-setup:
build:
context: kafka-setup
image: linkedin/datahub-kafka-setup:${DATAHUB_VERSION:-latest}
image: linkedin/datahub-kafka-setup:${DATAHUB_VERSION:-head}
env_file: kafka-setup/env/docker.env
hostname: kafka-setup
container_name: kafka-setup
Expand Down Expand Up @@ -115,7 +115,7 @@ services:
build:
context: ../
dockerfile: docker/datahub-gms/Dockerfile
image: linkedin/datahub-gms:${DATAHUB_VERSION:-latest}
image: linkedin/datahub-gms:${DATAHUB_VERSION:-head}
env_file: datahub-gms/env/docker-without-neo4j.env
hostname: datahub-gms
container_name: datahub-gms
Expand All @@ -130,7 +130,7 @@ services:
build:
context: ../
dockerfile: docker/datahub-frontend/Dockerfile
image: linkedin/datahub-frontend-react:${DATAHUB_VERSION:-latest}
image: linkedin/datahub-frontend-react:${DATAHUB_VERSION:-head}
env_file: datahub-frontend/env/docker.env
hostname: datahub-frontend-react
container_name: datahub-frontend-react
Expand Down
8 changes: 4 additions & 4 deletions docker/quickstart/docker-compose-without-neo4j.quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
- ELASTIC_CLIENT_HOST=elasticsearch
- ELASTIC_CLIENT_PORT=9200
hostname: datahub-frontend-react
image: linkedin/datahub-frontend-react:${DATAHUB_VERSION:-latest}
image: linkedin/datahub-frontend-react:${DATAHUB_VERSION:-head}
mem_limit: 512m
ports:
- 9002:9002
Expand All @@ -61,7 +61,7 @@ services:
- MAE_CONSUMER_ENABLED=true
- MCE_CONSUMER_ENABLED=true
hostname: datahub-gms
image: linkedin/datahub-gms:${DATAHUB_VERSION:-latest}
image: linkedin/datahub-gms:${DATAHUB_VERSION:-head}
mem_limit: 512m
ports:
- 8080:8080
Expand Down Expand Up @@ -104,7 +104,7 @@ services:
- KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- KAFKA_BOOTSTRAP_SERVER=broker:29092
hostname: kafka-setup
image: linkedin/datahub-kafka-setup:${DATAHUB_VERSION:-latest}
image: linkedin/datahub-kafka-setup:${DATAHUB_VERSION:-head}
mysql:
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
container_name: mysql
Expand Down Expand Up @@ -155,7 +155,7 @@ services:
- 2181:2181
volumes:
- zkdata:/var/opt/zookeeper
version: '2'
version: '2.3'
volumes:
esdata: null
mysqldata: null
Expand Down
2 changes: 1 addition & 1 deletion docker/quickstart/docker-compose.quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ services:
- 2181:2181
volumes:
- zkdata:/var/opt/zookeeper
version: '2'
version: '2.3'
volumes:
esdata: null
mysqldata: null
Expand Down
4 changes: 3 additions & 1 deletion docker/quickstart/generate_docker_quickstart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ def modify_docker_config(base_path, docker_yaml_config):
service["mem_limit"] = mem_limits[name]

# 8. Set docker compose version to 2.
docker_yaml_config["version"] = "2"
# We need at least this version, since we use features like start_period for
# healthchecks and shell-like variable interpolation.
docker_yaml_config["version"] = "2.3"


@click.command()
Expand Down