mindchain commited on
Commit
ef0ecdf
·
verified ·
1 Parent(s): af6e752

Fix: Remove duplicate network.host config

Browse files
Files changed (1) hide show
  1. Dockerfile +9 -10
Dockerfile CHANGED
@@ -1,27 +1,26 @@
1
- # Multi-stage build: Get OpenSearch from official image
2
  FROM opensearchproject/opensearch:2.11.0 AS opensearch
3
 
4
- # Main stage with Argilla
5
  FROM argilla/argilla-server:latest
6
 
7
  USER root
8
 
9
- # Copy OpenSearch from first stage
10
  COPY --from=opensearch /usr/share/opensearch /opt/opensearch
11
 
12
- # Create user and fix permissions
13
  RUN useradd -m -s /bin/bash opensearch || true && mkdir -p /var/lib/argilla && chown -R opensearch:opensearch /opt/opensearch
14
 
15
- # Disable OpenSearch security
16
- RUN sed -i 's/plugins.security.enabled: true/plugins.security.enabled: false/g' /opt/opensearch/config/opensearch.yml && echo "discovery.type: single-node" >> /opt/opensearch/config/opensearch.yml && echo "network.host: 127.0.0.1" >> /opt/opensearch/config/opensearch.yml
17
 
18
- # Set lower memory
19
- RUN echo "-Xms384m" >> /opt/opensearch/config/jvm.options && echo "-Xmx384m" >> /opt/opensearch/config/jvm.options
20
 
21
  ENV ARGILLA_ELASTICSEARCH=http://127.0.0.1:9200
22
  ENV ARGILLA_SEARCH_ENGINE=opensearch
23
 
24
  EXPOSE 7860
25
 
26
- # Start OpenSearch then Argilla
27
- CMD su opensearch -c "/opt/opensearch/bin/opensearch" & sleep 45 && python -m argilla_server database migrate && python -m argilla_server start --host 0.0.0.0 --port 7860
 
1
+ # Multi-stage: Get OpenSearch
2
  FROM opensearchproject/opensearch:2.11.0 AS opensearch
3
 
4
+ # Main: Argilla + OpenSearch
5
  FROM argilla/argilla-server:latest
6
 
7
  USER root
8
 
9
+ # Copy OpenSearch
10
  COPY --from=opensearch /usr/share/opensearch /opt/opensearch
11
 
12
+ # Setup
13
  RUN useradd -m -s /bin/bash opensearch || true && mkdir -p /var/lib/argilla && chown -R opensearch:opensearch /opt/opensearch
14
 
15
+ # Configure OpenSearch - only add settings that don't exist
16
+ RUN echo "discovery.type: single-node" >> /opt/opensearch/config/opensearch.yml
17
 
18
+ # Lower memory
19
+ RUN sed -i 's/-Xms1g/-Xms384m/g' /opt/opensearch/config/jvm.options && sed -i 's/-Xmx1g/-Xmx384m/g' /opt/opensearch/config/jvm.options
20
 
21
  ENV ARGILLA_ELASTICSEARCH=http://127.0.0.1:9200
22
  ENV ARGILLA_SEARCH_ENGINE=opensearch
23
 
24
  EXPOSE 7860
25
 
26
+ CMD su opensearch -c "/opt/opensearch/bin/opensearch" & sleep 50 && python -m argilla_server database migrate && python -m argilla_server start --host 0.0.0.0 --port 7860