Skip to content

Update and cleanup docker files #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 22, 2022
Merged

Update and cleanup docker files #31

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
20dd9eb
Added docker `--security-opt seccomp=unconfined` parameter as default
minosgalanakis Jan 12, 2022
97b3ba3
Set ubuntu-16.04 Dockerfile as baseline for ubuntu-18.04 alignment
minosgalanakis Jan 12, 2022
9d8894f
Updated ARMLMD_LICENSE_FILE environment variable
minosgalanakis Jan 13, 2022
ced6663
Updated ubuntu-18.04 Dockerfile for abi-dumper, abi-compliance-checker
minosgalanakis Jan 12, 2022
d61658c
Updated ubuntu-18.04 Dockerfile to remove the workaround for GnuTLS 3.7
minosgalanakis Jan 13, 2022
0f0e47d
Updated ubuntu-18.04 Dockerfile to use latest pip/setuptools
minosgalanakis Jan 13, 2022
5c49542
Added ubuntu-20.04 Dockerfile
minosgalanakis Jan 14, 2022
7e74103
Updated dockerfile_builder to incude 20.04 image
minosgalanakis Jan 14, 2022
c0bf392
Updated ubuntu-18.04/20.04 Dockerfiles
minosgalanakis Jan 25, 2022
58938a3
Ammended the removal of a valid comment from ubuntu-18.04 Dockerfile
minosgalanakis Feb 8, 2022
45a5fce
Updated ubuntu-20.04 Dockerfile
minosgalanakis Feb 8, 2022
ef1f053
Removed mypy and pylint dependencies
minosgalanakis Feb 8, 2022
74ea266
Revert "Added docker `--security-opt seccomp=unconfined` parameter as…
minosgalanakis Feb 8, 2022
36b60be
Dockerfiles: Set the HOME to /var/lib/ws
minosgalanakis Feb 8, 2022
a15b48d
Dockerfiles: Set the HOME to /var/lib/builds
minosgalanakis Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions resources/docker_files/ubuntu-16.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ubuntu-16.04/Dockerfile
#
# Copyright (c) 2018-2021, ARM Limited, All Rights Reserved
# Copyright (c) 2018-2022, ARM Limited, All Rights Reserved
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
Expand Down Expand Up @@ -28,6 +28,10 @@ FROM ubuntu:16.04
ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /opt/src

# Note: scripts/min_requirements.py need a writable
# destination for installing python dependencies
ENV HOME=/var/lib/ws
Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm Feb 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/var/lib/ws doesn't exist by default, and it's a directory outside the Docker image. /var/lib/builds is the one that's created by default and owned by user. So I think HOME should be set to that instead. Sorry, I wasn't thinking properly when I suggested /var/lib/ws.


# Support for i386:
# - for 32-bit builds+tests of Mbed TLS
# - required to install Arm Compiler 5.06 (armcc)
Expand Down Expand Up @@ -117,7 +121,7 @@ RUN wget -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-PA-

ENV ARMC5_BIN_DIR=/usr/local/ARM_Compiler_5.06u3/bin/
ENV PATH=$PATH:/usr/local/ARM_Compiler_5.06u3/bin
ENV ARMLMD_LICENSE_FILE=[email protected]
ENV ARMLMD_LICENSE_FILE=[email protected]:[email protected]:[email protected]:[email protected]

# Install ARM Compiler 6.6
RUN mkdir temp && cd temp && \
Expand Down Expand Up @@ -254,12 +258,6 @@ RUN git clone --branch 1.1 https://github.com/lvc/abi-dumper.git && \
RUN python3 -m pip install 'pip<21' --upgrade | cat && \
python3 -m pip config set global.progress_bar off && \
python3 -m pip install setuptools --upgrade && \
# For pylint we want a known version, as later versions may add checks at
# any time, making CI results unpredictable.
python3 -m pip install pylint==2.4.4 && \
# For mypy, use the earliest version that works with our code base.
# See https://github.com/ARMmbed/mbedtls/pull/3953 .
python3 -m pip install mypy==0.780 && \
true

# Set locale for ARMCC to work
Expand Down
Loading