diff options
| author | freva <valerijf@yahoo-inc.com> | 2016-11-29 12:56:58 +0100 |
|---|---|---|
| committer | freva <valerijf@yahoo-inc.com> | 2016-11-29 12:56:58 +0100 |
| commit | dc142fc1c35c6e9cf0d3199434925afc8b43050b (patch) | |
| tree | f6fc2bca78cd17fd54a3b37447635f3bbbb2d12c /docker-api | |
| parent | ece5947d146b156d52fa061c89f1296b613b3563 (diff) | |
Use Dockerfile.template instead of Dockerfile
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/.gitignore | 1 | ||||
| -rw-r--r-- | docker-api/src/test/resources/systest/Dockerfile.template (renamed from docker-api/src/test/resources/systest/Dockerfile) | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docker-api/.gitignore b/docker-api/.gitignore new file mode 100644 index 00000000000..1d1fe94df49 --- /dev/null +++ b/docker-api/.gitignore @@ -0,0 +1 @@ +Dockerfile
\ No newline at end of file diff --git a/docker-api/src/test/resources/systest/Dockerfile b/docker-api/src/test/resources/systest/Dockerfile.template index 8522f43d22e..f6aa8f37842 100644 --- a/docker-api/src/test/resources/systest/Dockerfile +++ b/docker-api/src/test/resources/systest/Dockerfile.template @@ -1,4 +1,4 @@ -FROM docker-registry.ops.yahoo.com:4443/vespa/ci:6.50.12 +FROM $VESPA_BASE_IMAGE # Don't autostart anything when building image RUN yinst set root.autostart=off |