fix(build): docker compose and implicit wait for elasticsearch

argilla-io · May 20, 2021 · 3a2c0f5 · 3a2c0f5
1 parent 9e9ce9f
commit 3a2c0f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -30,3 +30,5 @@ RUN rm -rf /build \
 # See <https://github.com/tiangolo/uvicorn-gunicorn-fastapi-docker#module_name>
 ENV MODULE_NAME="rubrix.server.server"
 ENV VARIABLE_NAME="app"
+
+CMD /wait-for-it.sh $ELASTICSEARCH -- /start.sh
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -8,8 +8,6 @@ services:
     environment:
       ELASTICSEARCH: http://elasticsearch:9200
 
-    command: /wait-for-it.sh elasticsearch:9200 -- /start.sh
-
     networks:
       - rubrix
 

diff --git a/release.Dockerfile b/release.Dockerfile
@@ -4,8 +4,12 @@ COPY dist/*.whl /packages/
 
 ENV USERS_DB=/config/.users.yml
 
-RUN find /packages/*.whl -exec pip install {}[server] \;
+RUN wget -O /wait-for-it.sh https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh \
+ && chmod +x /wait-for-it.sh \
+ && find /packages/*.whl -exec pip install {}[server] \;
 
 # See <https://github.com/tiangolo/uvicorn-gunicorn-fastapi-docker#module_name>
 ENV MODULE_NAME="rubrix.server.server"
 ENV VARIABLE_NAME="app"
+
+CMD /wait-for-it.sh $ELASTICSEARCH -- /start.sh