-
Notifications
You must be signed in to change notification settings - Fork 510
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #755 from andrewhsu/compose-v2
convert docker compose files to v2
- Loading branch information
Showing
2 changed files
with
110 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,61 @@ | ||
| server: | ||
| build: . | ||
| dockerfile: server.Dockerfile | ||
| links: | ||
| - mysql | ||
| - signer | ||
| - signer:notarysigner | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.json" | ||
| signer: | ||
| build: . | ||
| dockerfile: signer.Dockerfile | ||
| links: | ||
| - mysql | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.json" | ||
| mysql: | ||
| volumes: | ||
| - ./notarymysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d | ||
| image: mariadb:10.1.10 | ||
| environment: | ||
| - TERM=dumb | ||
| - MYSQL_ALLOW_EMPTY_PASSWORD="true" | ||
| command: mysqld --innodb_file_per_table | ||
| client: | ||
| volumes: | ||
| - ./test_output:/test_output | ||
| build: . | ||
| dockerfile: Dockerfile | ||
| links: | ||
| - server:notary-server | ||
| command: buildscripts/testclient.sh | ||
| version: "2" | ||
| services: | ||
| server: | ||
| build: | ||
| context: . | ||
| dockerfile: server.Dockerfile | ||
| networks: | ||
| mdb: | ||
| sig: | ||
| srv: | ||
| aliases: | ||
| - notary-server | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.json" | ||
| depends_on: | ||
| - mysql | ||
| - signer | ||
| signer: | ||
| build: | ||
| context: . | ||
| dockerfile: signer.Dockerfile | ||
| networks: | ||
| mdb: | ||
| sig: | ||
| aliases: | ||
| - notarysigner | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.json" | ||
| depends_on: | ||
| - mysql | ||
| mysql: | ||
| networks: | ||
| - mdb | ||
| volumes: | ||
| - ./notarymysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d | ||
| image: mariadb:10.1.10 | ||
| environment: | ||
| - TERM=dumb | ||
| - MYSQL_ALLOW_EMPTY_PASSWORD="true" | ||
| command: mysqld --innodb_file_per_table | ||
| client: | ||
| build: | ||
| context: . | ||
| dockerfile: Dockerfile | ||
| command: buildscripts/testclient.sh | ||
| volumes: | ||
| - ./test_output:/test_output | ||
| networks: | ||
| - srv | ||
| depends_on: | ||
| - server | ||
| volumes: | ||
| notary_data: | ||
| external: false | ||
| networks: | ||
| mdb: | ||
| external: false | ||
| sig: | ||
| external: false | ||
| srv: | ||
| external: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,49 @@ | ||
| server: | ||
| build: . | ||
| dockerfile: server.Dockerfile | ||
| links: | ||
| - mysql | ||
| - signer | ||
| - signer:notarysigner | ||
| ports: | ||
| - "8080" | ||
| - "4443:4443" | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.json" | ||
| signer: | ||
| build: . | ||
| dockerfile: signer.Dockerfile | ||
| links: | ||
| - mysql | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.json" | ||
| mysql: | ||
| volumes: | ||
| - ./notarymysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d | ||
| - notary_data:/var/lib/mysql | ||
| image: mariadb:10.1.10 | ||
| environment: | ||
| - TERM=dumb | ||
| - MYSQL_ALLOW_EMPTY_PASSWORD="true" | ||
| command: mysqld --innodb_file_per_table | ||
| version: "2" | ||
| services: | ||
| server: | ||
| build: | ||
| context: . | ||
| dockerfile: server.Dockerfile | ||
| networks: | ||
| - mdb | ||
| - sig | ||
| ports: | ||
| - "8080" | ||
| - "4443:4443" | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-server -config=fixtures/server-config.json" | ||
| depends_on: | ||
| - mysql | ||
| - signer | ||
| signer: | ||
| build: | ||
| context: . | ||
| dockerfile: signer.Dockerfile | ||
| networks: | ||
| mdb: | ||
| sig: | ||
| aliases: | ||
| - notarysigner | ||
| entrypoint: /usr/bin/env sh | ||
| command: -c "./migrations/migrate.sh && notary-signer -config=fixtures/signer-config.json" | ||
| depends_on: | ||
| - mysql | ||
| mysql: | ||
| networks: | ||
| - mdb | ||
| volumes: | ||
| - ./notarymysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d | ||
| - notary_data:/var/lib/mysql | ||
| image: mariadb:10.1.10 | ||
| environment: | ||
| - TERM=dumb | ||
| - MYSQL_ALLOW_EMPTY_PASSWORD="true" | ||
| command: mysqld --innodb_file_per_table | ||
| volumes: | ||
| notary_data: | ||
| external: false | ||
| networks: | ||
| mdb: | ||
| external: false | ||
| sig: | ||
| external: false |