moshe · moshe · May 30, 2020 · May 30, 2020 · May 30, 2020 · May 30, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -59,13 +59,13 @@ jobs:
       - checkout
       - restore_cache:
          keys:
-           - server3-{{ checksum "server/Pipfile.lock" }}-{{ checksum "server/Dockerfile" }}
+           - server3-{{ checksum "Pipfile.lock" }}-{{ checksum "comrade/Dockerfile" }}
       - run:
          name: Load Docker image layer cache
          command: test -f caches/server.tar && (docker load -i caches/server.tar) || echo 'Cache not found'
       - run:
          name: Build application Docker image
-         command: docker build --tag server:latest -f server/Dockerfile .
+         command: docker build --tag server:latest -f comrade/Dockerfile .
       - run:
          name: flake8
          command: docker run -it server pipenv run flake8 --max-line-length=1000
@@ -84,18 +84,18 @@ jobs:
       - checkout
       - restore_cache:
          keys:
-           - server3-{{ checksum "server/Pipfile.lock" }}-{{ checksum "server/Dockerfile" }}
+           - server3-{{ checksum "Pipfile.lock" }}-{{ checksum "comrade/Dockerfile" }}
       - run:
          name: Load Docker image layer cache
          command: test -f caches/server.tar && (docker load -i caches/server.tar) || echo 'Cache not found'
       - run:
          name: Save Docker image layer cache
          command: |
            mkdir -p caches/
-           docker build --tag server -f server/Dockerfile .
+           docker build --tag server -f comrade/Dockerfile .
            docker save $(docker history -q server | grep -v '^<missing>$') -o caches/server.tar
       - save_cache:
-          key: server3-{{ checksum "server/Pipfile.lock" }}-{{ checksum "server/Dockerfile" }}
+          key: server3-{{ checksum "Pipfile.lock" }}-{{ checksum "comrade/Dockerfile" }}
           paths:
             - caches/
   pytest:

diff --git a/server/Pipfile → Pipfile b/server/Pipfile → Pipfile
diff --git a/server/Pipfile.lock → Pipfile.lock b/server/Pipfile.lock → Pipfile.lock
diff --git a/server/.gitignore → comrade/.gitignore b/server/.gitignore → comrade/.gitignore
diff --git a/server/Dockerfile → comrade/Dockerfile b/server/Dockerfile → comrade/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.7.7-slim@sha256:56de27efa2d88b47bede6d075a60a70aed76c43a8ee0bbbaa39c8f445a4459fe
 WORKDIR /app
-COPY setup.py MANIFEST.in server/Pipfile* ./
+COPY setup.py MANIFEST.in Pipfile* ./
 RUN apt-get update && \
     apt-get install -y --no-install-recommends gcc python-dev g++ make libffi-dev libssl-dev &&\
     mkdir /app/comrade && \
@@ -11,6 +11,6 @@ RUN apt-get update && \
     find /root/.local/ -type d -name __pycache__ | xargs rm -rf && \
     rm -rf ~/.cache /var/cache && \
     rm -rf /var/lib/apt/lists/*
-COPY server/ /app/comrade/
+COPY comrade/ /app/comrade/
 EXPOSE 8000
 CMD pipenv run comrade
diff --git a/server/blueprints/__init__.py → comrade/blueprints/__init__.py b/server/blueprints/__init__.py → comrade/blueprints/__init__.py
diff --git a/server/blueprints/alias.py → comrade/blueprints/alias.py b/server/blueprints/alias.py → comrade/blueprints/alias.py
diff --git a/server/blueprints/cluster.py → comrade/blueprints/cluster.py b/server/blueprints/cluster.py → comrade/blueprints/cluster.py
diff --git a/server/blueprints/index.py → comrade/blueprints/index.py b/server/blueprints/index.py → comrade/blueprints/index.py
diff --git a/server/blueprints/node.py → comrade/blueprints/node.py b/server/blueprints/node.py → comrade/blueprints/node.py
diff --git a/server/blueprints/rest.py → comrade/blueprints/rest.py b/server/blueprints/rest.py → comrade/blueprints/rest.py
diff --git a/server/blueprints/snapshot.py → comrade/blueprints/snapshot.py b/server/blueprints/snapshot.py → comrade/blueprints/snapshot.py
diff --git a/server/blueprints/task.py → comrade/blueprints/task.py b/server/blueprints/task.py → comrade/blueprints/task.py
diff --git a/server/blueprints/template.py → comrade/blueprints/template.py b/server/blueprints/template.py → comrade/blueprints/template.py
diff --git a/server/blueprints/views.py → comrade/blueprints/views.py b/server/blueprints/views.py → comrade/blueprints/views.py
diff --git a/server/clusters/.gitignore → comrade/clusters/.gitignore b/server/clusters/.gitignore → comrade/clusters/.gitignore
diff --git a/server/connections.py → comrade/connections.py b/server/connections.py → comrade/connections.py
diff --git a/...x_settings/00_dynamic_index_settings.json → ...x_settings/00_dynamic_index_settings.json b/...x_settings/00_dynamic_index_settings.json → ...x_settings/00_dynamic_index_settings.json
diff --git a/.../index_settings/10_translog_settings.json → .../index_settings/10_translog_settings.json b/.../index_settings/10_translog_settings.json → .../index_settings/10_translog_settings.json
diff --git a/...rch/index_settings/20_index_slowlogs.json → ...rch/index_settings/20_index_slowlogs.json b/...rch/index_settings/20_index_slowlogs.json → ...rch/index_settings/20_index_slowlogs.json
diff --git a/...ch/index_settings/21_search_slowlogs.json → ...ch/index_settings/21_search_slowlogs.json b/...ch/index_settings/21_search_slowlogs.json → ...ch/index_settings/21_search_slowlogs.json
diff --git a/...h/index_settings/40_merge_scheduling.json → ...h/index_settings/40_merge_scheduling.json b/...h/index_settings/40_merge_scheduling.json → ...h/index_settings/40_merge_scheduling.json
diff --git a/...arch/index_settings/41_index_sorting.json → ...arch/index_settings/41_index_sorting.json b/...arch/index_settings/41_index_sorting.json → ...arch/index_settings/41_index_sorting.json
diff --git a/server/elasticsearch_assets.py → comrade/elasticsearch_assets.py b/server/elasticsearch_assets.py → comrade/elasticsearch_assets.py
diff --git a/server/index.py → comrade/index.py b/server/index.py → comrade/index.py
diff --git a/server/scripts/create_data.py → comrade/scripts/create_data.py b/server/scripts/create_data.py → comrade/scripts/create_data.py
diff --git a/server/scripts/extract_index_settings.py → comrade/scripts/extract_index_settings.py b/server/scripts/extract_index_settings.py → comrade/scripts/extract_index_settings.py
diff --git a/server/scripts/find_servers.py → comrade/scripts/find_servers.py b/server/scripts/find_servers.py → comrade/scripts/find_servers.py
diff --git a/server/tests/cluster1.json → comrade/tests/cluster1.json b/server/tests/cluster1.json → comrade/tests/cluster1.json
diff --git a/server/tests/test_mock.py → comrade/tests/test_mock.py b/server/tests/test_mock.py → comrade/tests/test_mock.py