diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2017-01-27 17:03:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 17:03:43 +0100 |
commit | 1d3b38f497b8c56c898abbcf2aada79961684bf5 (patch) | |
tree | d0a66f0ce670198294ce0912241ea822a0cec697 /node-admin | |
parent | e7b9f3f381973e911b04be221f1f23b4f74d09eb (diff) |
Revert "Freva/move node admin dockerfile"
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/.gitignore | 5 | ||||
-rw-r--r-- | node-admin/Dockerfile.template (renamed from node-admin/vespa-local/Dockerfile.template) | 12 | ||||
-rw-r--r-- | node-admin/include/http-server.xml (renamed from node-admin/vespa-local/http-server.xml) | 0 | ||||
-rw-r--r-- | node-admin/include/node-flavors.xml (renamed from node-admin/vespa-local/node-flavors.xml) | 0 | ||||
-rwxr-xr-x | node-admin/include/nodectl-instance.sh (renamed from node-admin/vespa-local/nodectl-instance.sh) | 0 | ||||
-rw-r--r-- | node-admin/include/root-bashrc (renamed from node-admin/vespa-local/root-bashrc) | 0 | ||||
-rwxr-xr-x | node-admin/include/start-config-server.sh (renamed from node-admin/vespa-local/start-config-server.sh) | 0 | ||||
-rwxr-xr-x | node-admin/include/start-services.sh (renamed from node-admin/vespa-local/start-services.sh) | 0 | ||||
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java | 4 |
9 files changed, 13 insertions, 8 deletions
diff --git a/node-admin/.gitignore b/node-admin/.gitignore index 8f00331723c..750f12730e3 100644 --- a/node-admin/.gitignore +++ b/node-admin/.gitignore @@ -1 +1,4 @@ -vespa-local/Dockerfile +/dependencies +/Dockerfile +include/services.xml +/**/*.pyc diff --git a/node-admin/vespa-local/Dockerfile.template b/node-admin/Dockerfile.template index 53f8bfac18f..e69308deae3 100644 --- a/node-admin/vespa-local/Dockerfile.template +++ b/node-admin/Dockerfile.template @@ -15,19 +15,21 @@ FROM $NODE_ADMIN_FROM_IMAGE # Be aware that this Dockerfile is not being used in any pipelines and has no relation to production environments etc. # It is here for developers' convenience - it allows building and experimenting with node-admin locally. +CMD $VESPA_HOME/bin/start-services.sh + # Things for convenience. RUN yum install -y tcpdump -ADD root-bashrc /root/.bashrc +ADD include/root-bashrc /root/.bashrc # Make config-server aware of node flavor 'docker'. -ADD node-flavors.xml $VESPA_HOME/conf/configserver-app/node-flavors.xml +ADD include/node-flavors.xml $VESPA_HOME/conf/configserver-app/node-flavors.xml # Make config-server also listen to 4080 -ADD http-server.xml $VESPA_HOME/conf/configserver-app/hosted-vespa/http-server.xml +ADD include/http-server.xml $VESPA_HOME/conf/configserver-app/hosted-vespa/http-server.xml # Entrypoint for running config server in a container. -ADD start-config-server.sh $VESPA_HOME/bin/start-config-server.sh +ADD include/start-config-server.sh $VESPA_HOME/bin/start-config-server.sh # Included in base image, but here overridden with local modifications. # TODO: Update the source instead. -ADD start-services.sh $VESPA_HOME/bin/start-services.sh +ADD include/start-services.sh $VESPA_HOME/bin/start-services.sh diff --git a/node-admin/vespa-local/http-server.xml b/node-admin/include/http-server.xml index f77d392de97..f77d392de97 100644 --- a/node-admin/vespa-local/http-server.xml +++ b/node-admin/include/http-server.xml diff --git a/node-admin/vespa-local/node-flavors.xml b/node-admin/include/node-flavors.xml index 7d22975994a..7d22975994a 100644 --- a/node-admin/vespa-local/node-flavors.xml +++ b/node-admin/include/node-flavors.xml diff --git a/node-admin/vespa-local/nodectl-instance.sh b/node-admin/include/nodectl-instance.sh index b40ce44e33a..b40ce44e33a 100755 --- a/node-admin/vespa-local/nodectl-instance.sh +++ b/node-admin/include/nodectl-instance.sh diff --git a/node-admin/vespa-local/root-bashrc b/node-admin/include/root-bashrc index fda1752c85f..fda1752c85f 100644 --- a/node-admin/vespa-local/root-bashrc +++ b/node-admin/include/root-bashrc diff --git a/node-admin/vespa-local/start-config-server.sh b/node-admin/include/start-config-server.sh index a592ec3cbd3..a592ec3cbd3 100755 --- a/node-admin/vespa-local/start-config-server.sh +++ b/node-admin/include/start-config-server.sh diff --git a/node-admin/vespa-local/start-services.sh b/node-admin/include/start-services.sh index 0fe5c1c0724..0fe5c1c0724 100755 --- a/node-admin/vespa-local/start-services.sh +++ b/node-admin/include/start-services.sh diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java index 0f1f79d68a1..2dd2ef6f6ac 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java @@ -123,9 +123,9 @@ public class LocalZoneUtils { } public static void buildVespaLocalDockerImage(Docker docker, DockerImage vespaBaseImage) throws IOException { - Path dockerfilePath = PROJECT_ROOT.resolve("node-admin/vespa-local/Dockerfile"); + Path dockerfilePath = PROJECT_ROOT.resolve("node-admin/Dockerfile"); - Path dockerfileTemplatePath = Paths.get("node-admin/vespa-local/Dockerfile.template"); + Path dockerfileTemplatePath = Paths.get("node-admin/Dockerfile.template"); String dockerfileTemplate = new String(Files.readAllBytes(dockerfileTemplatePath)) .replaceAll("\\$NODE_ADMIN_FROM_IMAGE", vespaBaseImage.asString()) .replaceAll("\\$VESPA_HOME", Defaults.getDefaults().vespaHome()); |