Skip to content

Commit 6bacadc

Browse files
Merge pull request #1910 from jcantrill/1842439
Bug 1842721: vendor ruamel.yaml
2 parents 4e538a2 + f204a53 commit 6bacadc

File tree

7 files changed

+7
-5
lines changed

7 files changed

+7
-5
lines changed

curator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ RUN mkdir -p $(dirname "$CURATOR_CONF_LOCATION") && \
3333
chgrp -R 0 ${HOME} && \
3434
chmod -R g=u ${HOME}
3535
WORKDIR ${HOME}/vendor
36-
RUN pip3 install -q $(ls . | grep -v curator) --no-index --find-links . && \
37-
pip3 install -q --no-index elasticsearch-curator* && \
36+
RUN pip3 install $(ls . | grep -v curator) -q --no-index --find-links . && \
37+
pip3 install elasticsearch-curator* --no-index -q && \
3838
rm -rf $HOME/vendor && \
3939
ls /usr/local/bin/curator
4040

curator/Dockerfile.centos7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RUN mkdir -p $(dirname "$CURATOR_CONF_LOCATION") && \
3535
chgrp -R 0 ${HOME} && \
3636
chmod -R g=u ${HOME}
3737
WORKDIR ${HOME}/vendor
38-
RUN pip3 install -q $(ls . | grep -v curator) --no-index --find-links . && \
39-
pip3 install -q --no-index elasticsearch-curator* && \
38+
RUN pip3 install $(ls . | grep -v curator) -q --no-index --find-links . && \
39+
pip3 install --no-index elasticsearch-curator* -q && \
4040
rm -rf $HOME/vendor && \
4141
ls /usr/local/bin/curator
4242

curator/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
elasticsearch-curator==5.8.1
2+
ruamel.yaml==0.15.100

curator/run.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ fi
77
if [ "$CURATOR_LOG_LEVEL" = WARN ] ; then
88
export CURATOR_LOG_LEVEL="WARNING"
99
fi
10+
PYTHON_BIN=${PYTHON_BIN:-python3}
1011

1112
TIMES=60
1213

@@ -26,7 +27,7 @@ waitForES
2627

2728
# Check whether legacy config was supplied
2829
actions_location=${CURATOR_ACTIONS_FILE}
29-
python -u $HOME/lib/oalconverter/convert.py
30+
$PYTHON_BIN -u $HOME/lib/oalconverter/convert.py
3031
# 0 - actions file found
3132
# 1 - actions file generated from legacy config
3233
# 2 - an error occured
311 KB
Binary file not shown.

0 commit comments

Comments
 (0)