Skip to content

Commit

Permalink
Docker: Upgrade all Python packages as required.
Browse files Browse the repository at this point in the history
  • Loading branch information
JonatanAntoni committed Jul 14, 2021
1 parent d12f5c2 commit e54ebc4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
7 changes: 2 additions & 5 deletions docker/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ RUN chmod +x /usr/local/bin/PackChk

# install Python requirements
COPY requirements.txt ${INSTALLER_PATH}/
RUN python3 -m pip install --no-cache-dir -r ${INSTALLER_PATH}/requirements.txt
RUN python3 -m pip install -U --no-cache-dir pip && \
python3 -m pip install -U --no-cache-dir -r ${INSTALLER_PATH}/requirements.txt

# install buildtools
RUN python3 -m pip install --no-cache-dir -r ${INSTALLER_PATH}/buildtools/requirements.txt
Expand All @@ -93,10 +94,6 @@ COPY rtebuild /home/jenkins/.rtebuild
COPY rtebuild /root/.rtebuild
ENV PATH=${PATH}:${TOOLS_PATH}/buildtools

# install python-matrix-runner
# hadolint disable=DL3013
RUN python3 -m pip install ${INSTALLER_PATH}/python-matrix-runner

# set ARMLMD_LICENSE_FILE for ARM compilers
ENV ARMLMD_LICENSE_FILE="[email protected]:[email protected]:[email protected]:[email protected]"

Expand Down
4 changes: 2 additions & 2 deletions docker/dockerfile.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ WORKDIR /

# install Python requirements
COPY requirements.txt ${INSTALLER_PATH}/
RUN python3 -m pip install --no-cache-dir -r ${INSTALLER_PATH}/requirements.txt
RUN python3 -m pip install -U --no-cache-dir pip && \
python3 -m pip install -U --no-cache-dir -r ${INSTALLER_PATH}/requirements.txt

# install buildtools
RUN python3 -m pip install --no-cache-dir -r ${TOOLS_PATH}/buildtools/requirements.txt
COPY rtebuild /root/.rtebuild
ENV PATH=${PATH}:${TOOLS_PATH}/buildtools


# remove dependency folder
RUN rm -rf ${INSTALLER_PATH}

Expand Down

0 comments on commit e54ebc4

Please sign in to comment.