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

Changes from 1 commit
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
8 changes: 3 additions & 5 deletions resources/docker_files/ubuntu-18.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN apt-get update -q && apt-get install -yq \
libunistring-dev \
# for armcc
libstdc++6:i386 \
# to build GnuTLS (except 3.6 which uses --with-included-libtasn1)
# to build GnuTLS
libtasn1-6-dev \
# needed for armcc (see locale-gen below)
locales \
Expand Down Expand Up @@ -147,9 +147,7 @@ ENV PATH=/opt/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH
# GnuTLS has a number of (optional) dependencies:
# - nettle (crypto library): quite tighly coupled, so build one for each
# version of GnuTLS that we want.
# - libtasn1: can use the Ubuntu version, except for GnuTLS 3.7 which needs
# libtasn1 4.9 (Ubuntu 16.04 has 4.6); an config option
# --with-included-libtasn1 is available, so use it for GnuTLS 3.7.
# - libtasn1: can use the Ubuntu version
Copy link
Contributor

Choose a reason for hiding this comment

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

Please leave a note about --with-included-libtasn1 as a reminder, if in the future we need a bleeding-edge version of GnuTLS for which the Ubuntu version is not enough (like the comment on libunistring below).

# - p11-kit: optional, for smart-card support - configure it out
# - libunistring: since 3.6 - the Ubuntu package works; if it didn't a config
# option --with-included-libunistring is available.
Expand Down Expand Up @@ -221,7 +219,7 @@ RUN wget -q https://ftp.gnu.org/gnu/nettle/nettle-3.7.3.tar.gz && \
export PKG_CONFIG_PATH=/usr/local/libnettle-3.7.3/lib/pkgconfig:/usr/local/libnettle-3.7.3/lib64/pkgconfig:/usr/local/lib/pkgconfig && \
wget -q https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz && \
tar -xJf gnutls-3.7.2.tar.xz && cd gnutls-3.7.2 && \
./configure --prefix=/usr/local/gnutls-3.7.2 --exec_prefix=/usr/local/gnutls-3.7.2 --disable-shared --with-included-libtasn1 --without-p11-kit && \
./configure --prefix=/usr/local/gnutls-3.7.2 --exec_prefix=/usr/local/gnutls-3.7.2 --disable-shared --without-p11-kit && \
make && make install && cat config.log && cd .. && \
rm -rf gnutls-3.7.2*

Expand Down