Correct names of from-as images in dockerfiles

aymara · Apr 29, 2024 · e8ec5e4 · e8ec5e4
1 parent f3e2f78
commit e8ec5e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/continuous_integration/Dockerfile-debian12 b/continuous_integration/Dockerfile-debian12
@@ -81,9 +81,9 @@ RUN install -D -t /usr/share/apps/lima/packages /src/lima/build/*.deb
 RUN wget https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 -q && tar xjf linux-amd64-github-release.tar.bz2 && cp bin/linux/amd64/github-release /usr/bin
 
 # install python packages necessary to use the language resources install script
-RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then pip3 install arpy requests tqdm ; fi"
+RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then apt install python3-arpy python3-requests python3-tqdm  ; fi"
 
 # # install English and French UD models
-# RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi"
-# RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi"
+RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi"
+RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi"
 
diff --git a/continuous_integration/Dockerfile-manylinux_2_28_lima-manylinux b/continuous_integration/Dockerfile-manylinux_2_28_lima-manylinux
@@ -3,8 +3,8 @@ ARG QT_VERSION
 ARG MANYLINUX_TAG
 FROM aymara/manylinux_2_28_with_qt${QT_VERSION}_and_pyside-python${PYTHON_VERSION}:latest as aymara_manylinux_2_28_with_qt_and_pyside
 
-FROM aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest  as aymara_qhttpserver-manylinux2.28-qt${QT_VERSION}
-FROM aymara/svmtoolpp-manylinux2.28-qt${QT_VERSION}:latest  as aymara_svmtoolpp-manylinux2.28-qt${QT_VERSION}
+FROM aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest  as aymara_qhttpserver-manylinux2.28-qt
+FROM aymara/svmtoolpp-manylinux2.28-qt${QT_VERSION}:latest  as aymara_svmtoolpp-manylinux2.28-qt
 
 ARG MANYLINUX_TAG
 FROM quay.io/pypa/manylinux_2_28_x86_64:${MANYLINUX_TAG}
@@ -22,8 +22,8 @@ COPY --from=aymara/manylinux_2_28_with_nltk_data:latest /nltk_data /nltk_data
 COPY --from=aymara/manylinux_2_28_with_tensorflow_for_lima_1_9:latest /tensorflow_for_lima /usr/local
 COPY --from=aymara_manylinux_2_28_with_qt_and_pyside /opt /opt
 COPY --from=aymara_manylinux_2_28_with_qt_and_pyside /usr/local /usr/local
-COPY --from=aymara_qhttpserver-manylinux2.28-qt${QT_VERSION} /opt/qhttpserver /usr
-COPY --from=aymara_svmtoolpp-manylinux2.28-qt${QT_VERSION} /opt/svmtool++ /usr
+COPY --from=aymara_qhttpserver-manylinux2.28-qt /opt/qhttpserver /usr
+COPY --from=aymara_svmtoolpp-manylinux2.28-qt /opt/svmtool++ /usr
 
 ARG BRANCH=master
 ARG USE_TENSORFLOW="true"

diff --git a/continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux b/continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux
@@ -2,8 +2,8 @@ ARG QT_VERSION
 ARG MANYLINUX_TAG
 FROM aymara/manylinux_2_28_with_qt${QT_VERSION}:latest as aymara_manylinux_2_28_with_qt
 
-FROM aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest  as aymara_qhttpserver-manylinux2.28-qt${QT_VERSION}
-FROM aymara/svmtoolpp-manylinux2.28-qt${QT_VERSION}:latest  as aymara_svmtoolpp-manylinux2.28-qt${QT_VERSION}
+FROM aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest  as aymara_qhttpserver-manylinux2.28-qt
+FROM aymara/svmtoolpp-manylinux2.28-qt${QT_VERSION}:latest  as aymara_svmtoolpp-manylinux2.28-qt
 
 ARG MANYLINUX_TAG
 FROM quay.io/pypa/manylinux_2_28_x86_64:${MANYLINUX_TAG}
@@ -26,8 +26,8 @@ COPY --from=aymara/manylinux_2_28_with_nltk_data:latest /nltk_data /nltk_data
 COPY --from=aymara/manylinux_2_28_with_tensorflow_for_lima_1_9:latest /tensorflow_for_lima /usr/local
 COPY --from=aymara_manylinux_2_28_with_qt /opt /opt
 COPY --from=aymara_manylinux_2_28_with_qt /usr/local /usr/local
-COPY --from=aymara_qhttpserver-manylinux2.28-qt${QT_VERSION} /opt/qhttpserver /usr
-COPY --from=aymara_svmtoolpp-manylinux2.28-qt${QT_VERSION} /opt/svmtool++ /usr
+COPY --from=aymara_qhttpserver-manylinux2.28-qt /opt/qhttpserver /usr
+COPY --from=aymara_svmtoolpp-manylinux2.28-qt /opt/svmtool++ /usr
 
 ARG BRANCH=master
 ARG USE_TENSORFLOW="true"

diff --git a/continuous_integration/Dockerfile-ubuntu22.04 b/continuous_integration/Dockerfile-ubuntu22.04
@@ -95,6 +95,6 @@ RUN /bin/bash -c 'if [[ "$USE_TENSORFLOW" == true ]] ; then pip3 install arpy re
 
 # Stop dowloading lima models as appveyor build timeouts
 # # install English and French UD models
-# RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi"
-# RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi"
+RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi"
+RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi"