diff --git a/Dockerfile b/config/Dockerfile similarity index 94% rename from Dockerfile rename to config/Dockerfile index 6ec26377..02ba84aa 100644 --- a/Dockerfile +++ b/config/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -y && \ # Add the local code to the /app directory and set it to be the working directory. # Since we mount the /app directory as a volume in docker-compose.yml, this # allows us to automatically update the code in the Docker image when it's changed. -ADD . /app +ADD .. /app WORKDIR /app # Get the arguments from the docker-compose environment. @@ -16,7 +16,7 @@ ARG PORT EXPOSE ${PORT} # Create the conda environment. -RUN conda env create -f environment.yml +RUN conda env create -f config/environment.yml # Use the conda environment we created to run the application. # To enable the conda env, we cannot simply RUN `conda activate semantic-search`, diff --git a/environment.yml b/config/environment.yml similarity index 100% rename from environment.yml rename to config/environment.yml diff --git a/sample_config.yml b/config/sample_config.yml similarity index 100% rename from sample_config.yml rename to config/sample_config.yml diff --git a/docker-compose.yml b/docker-compose.yml index e9b1dbfb..cf0da66b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: server: build: context: . - dockerfile: Dockerfile + dockerfile: config/Dockerfile args: - PORT=8000 ports: @@ -30,4 +30,4 @@ services: - ./tests/data/models/:/data/models/ # Use 0.0.0.0 to explicitly set the host ip for the service on the container. https://pythonspeed.com/articles/docker-connection-refused/ - command: --host="0.0.0.0" --port=8000 -c=sample_config.yml -vv + command: --host="0.0.0.0" --port=8000 -c=config/sample_config.yml -vv