Commit 8eb049c0 authored by Matthieu Lamalle's avatar Matthieu Lamalle

Merge branch 'feature/212_TiramisuUpdate' into 'develop'

update tiramisu version

See merge request !10
parents 4e373645 1e81925f
Pipeline #245 passed with stage
in 0 seconds
......@@ -60,7 +60,7 @@ RUN git clone "${PYTHON_ZEPHIR_REPO_URL}" "/tmp/python-zephir" \
# Tiramisu
ARG TIRAMISU_REPO_URL=https://framagit.org/tiramisu/tiramisu.git
ARG TIRAMISU_REPO_REF=26fa9231
ARG TIRAMISU_REPO_REF=release/3.0rc3
ARG TIRAMISU_DEST_DIR=/tmp/build/tiramisu
# XXX: specific stable tag in the feature/3.0 tiramisu development branch
RUN git clone "${TIRAMISU_REPO_URL}" /tmp/tiramisu \
......@@ -72,7 +72,7 @@ RUN git clone "${TIRAMISU_REPO_URL}" /tmp/tiramisu \
# Tiramisu json
ARG TIRAMISU_JSON_REPO_URL=https://framagit.org/tiramisu/tiramisu-json.git
ARG TIRAMISU_JSON_REPO_REF=72031109
ARG TIRAMISU_JSON_REPO_REF=0e6fd8b29ccb27e902071d1e7b2ca857b00477d3
RUN git clone "${TIRAMISU_JSON_REPO_URL}" /tmp/tiramisu-json \
&& cd /tmp/tiramisu-json \
&& git checkout "${TIRAMISU_JSON_REPO_REF}"
......@@ -150,14 +150,11 @@ COPY containerpilot.json5 /etc/containerpilot.json5
## Service specific
##
RUN apt-get update -y && apt-get install -y \
python3-ipy
# Tiramisu
COPY --from=build /tmp/build/tiramisu/usr/share/locale /usr/share/locale
COPY --from=build /tmp/build/tiramisu/usr/local/lib/python3.6/dist-packages/tiramisu/ /usr/local/lib/python3.6/dist-packages/tiramisu/
COPY --from=build /tmp/tiramisu/tiramisu/storage/cache /usr/local/lib/python3.6/dist-packages/tiramisu/storage/cache
COPY --from=build /tmp/tiramisu/tiramisu/storage/dictionary /usr/local/lib/python3.6/dist-packages/tiramisu/storage/dictionary
COPY --from=build /tmp/tiramisu/tiramisu/storage/sqlalchemy /usr/local/lib/python3.6/dist-packages/tiramisu/storage/sqlalchemy
COPY --from=build /tmp/tiramisu/tiramisu/storage/sqlite3 /usr/local/lib/python3.6/dist-packages/tiramisu/storage/sqlite3
# Tiramisu json
COPY --from=build /tmp/tiramisu-json/tiramisu_json/ /usr/lib/python3/dist-packages/tiramisu_json
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment