Browse Source

deploy/docker: use apt-get instead of apt

`apt` complains loudly:

    WARNING: apt does not have a stable CLI interface. Use with caution in scripts.

We can use `apt-get` instead to avoid this warning.
QGC4.4
David Lechner 2 years ago committed by Patrick José Pereira
parent
commit
42b2cb675d
  1. 2
      deploy/docker/Dockerfile-build-linux
  2. 4
      deploy/docker/install-qt-linux.sh

2
deploy/docker/Dockerfile-build-linux

@ -18,7 +18,7 @@ ENV QT_DESKTOP $QT_PATH/${QT_VERSION}/gcc_64 @@ -18,7 +18,7 @@ ENV QT_DESKTOP $QT_PATH/${QT_VERSION}/gcc_64
ENV PATH /usr/lib/ccache:$QT_DESKTOP/bin:$PATH
RUN apt update && apt -y --quiet --no-install-recommends install \
RUN apt-get update && apt-get -y --quiet --no-install-recommends install \
apt-utils \
binutils \
build-essential \

4
deploy/docker/install-qt-linux.sh

@ -10,8 +10,8 @@ QT_MODULES="${QT_MODULES:-qtcharts}" @@ -10,8 +10,8 @@ QT_MODULES="${QT_MODULES:-qtcharts}"
# Exit immediately if a command exits with a non-zero status
set -e
apt update
apt install python3 python3-pip -y
apt-get update
apt-get install python3 python3-pip -y
pip3 install aqtinstall
aqt install --outputdir ${QT_PATH} ${QT_VERSION} ${QT_HOST} ${QT_TARGET} -m ${QT_MODULES}
echo "Remember to export the following to your PATH: ${QT_PATH}/${QT_VERSION}/*/bin"

Loading…
Cancel
Save