From 714ad119fb354c2d9b571bfdff43658e135268d7 Mon Sep 17 00:00:00 2001 From: Jan Erik Petersen Date: Sun, 9 Aug 2020 03:22:27 +0200 Subject: [PATCH] Move Dockerfile and docker-compose.yml into root --- docker/Dockerfile => Dockerfile | 0 README.md | 6 +++--- docker/docker-compose.yml => docker-compose.yml | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename docker/Dockerfile => Dockerfile (100%) rename docker/docker-compose.yml => docker-compose.yml (100%) diff --git a/docker/Dockerfile b/Dockerfile similarity index 100% rename from docker/Dockerfile rename to Dockerfile diff --git a/README.md b/README.md index 2941c12..2a81633 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ When building the docker image for EaaS, the entire build is done within a conta Simply run the following command to create the image ready for production use: ``` -$ docker build -t explorviz/eaas-server:latest -f docker/Dockerfile . +$ docker build -t explorviz/eaas-server:latest . ``` Because the entire build runs inside the container, dependencies might have to be downloaded on every run. This can be very time consuming during development. To prevent this, another Dockerfile is included that uses the experimental cache mount feature to permanently store downloaded dependencies. To use this file your docker daemon needs to run in experimental mode, then build the image like this: @@ -38,10 +38,10 @@ $ DOCKER_BUILDKIT=1 docker build -t explorviz/eaas-server:latest -f docker/exper ### Running the docker image -If you have docker-compose installed you can use the easy-to-configure `docker-compose.yml` in the docker directory. You can configure some options from there. Start the container by running: +If you have docker-compose installed you can use the easy-to-configure `docker-compose.yml`. You can configure some options from there. Start the container by running: ``` -$ docker-compose -f docker/docker-compose.yml up -d +$ docker-compose up -d ``` If you prefer to use `docker` directly, use something like diff --git a/docker/docker-compose.yml b/docker-compose.yml similarity index 100% rename from docker/docker-compose.yml rename to docker-compose.yml