Skip to content
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

Jump to bottom

update dependencies and tools #87

Merged
merged 11 commits into from
Jan 11, 2023
Merged

update dependencies and tools #87

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0a880d7
update base image to Fedora 37
bcressey Dec 3, 2022
54db7df
update Buildroot to 2022.11
bcressey Jan 3, 2023
9a34807
switch to GCC 11
bcressey Jan 3, 2023
fc9b1e6
update LLVM to 15.0.6
bcressey Dec 3, 2022
767ed59
update Rust to 1.66.1
bcressey Dec 3, 2022
eee45dd
update SPDX license data to 3.19
bcressey Dec 3, 2022
4d2b88c
update cargo-deny to 0.13.5
bcressey Dec 3, 2022
5d04e73
license-tool: update dependencies
bcressey Dec 3, 2022
e2e8b68
license-scan: update dependencies
bcressey Dec 3, 2022
0bfb362
refactor package install stages
bcressey Dec 14, 2022
8074a18
bump version to 0.29.0
bcressey Dec 3, 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
107 changes: 88 additions & 19 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,45 @@ FROM public.ecr.aws/docker/library/fedora:37 as base
RUN \
dnf makecache && \
dnf -y update && \
dnf -y groupinstall "C Development Tools and Libraries" && \
dnf -y install --setopt=install_weak_deps=False \
rpmdevtools dnf-plugins-core createrepo_c \
cmake git meson perl-ExtUtils-MakeMaker python which \
bc hostname intltool gperf kmod rsync wget openssl \
dwarves elfutils-devel libcap-devel openssl-devel \
createrepo_c e2fsprogs gdisk python3-jinja2 \
kpartx lz4 veritysetup dosfstools mtools squashfs-tools \
perl-FindBin perl-IPC-Cmd perl-open policycoreutils \
secilc qemu-img glib2-devel rpcgen erofs-utils jq ShellCheck \
json-c-devel libcurl-devel p11-kit-devel && \
bc \
bison \
cmake \
cpio \
curl \
dnf-plugins-core \
dwarves \
elfutils-devel \
flex \
g++ \
gcc \
git \
gperf \
hostname \
intltool \
jq \
json-c-devel \
kmod \
libcurl-devel \
libtool \
meson \
openssl \
openssl-devel \
p11-kit-devel \
perl-ExtUtils-MakeMaker \
perl-FindBin \
perl-IPC-Cmd \
perl-open \
python \
rsync \
wget \
which \
&& \
dnf config-manager --set-disabled \
fedora-modular updates-modular fedora-cisco-openh264 && \
dnf clean all && \
fedora-modular \
updates-modular \
fedora-cisco-openh264 \
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: these commands are reformatted here, but were added in the first commit of the series. Probably the diff will be smaller if the format doesn't change(?).

Copy link
Contributor

Choose a reason for hiding this comment

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

I think they should have been this newer format originally, and the sooner we change it then the sooner it's in better shape for ongoing updates where the diff can show individual lines more clearly.

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, so probably keep this format in the first commit of the series

Copy link
Contributor

Choose a reason for hiding this comment

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

This gets back to whether we treat our unit of change as individual commits or the pull request. I personally am not as concerned about individual commits in a PR unless there is a chance one of those commits may need to be reverted at some point.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure it would be worth the hassle.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair point - I'd tidy this up if there were another change, but I don't think it's worth the retesting burden just for commit history. Style-wise, that was consistent with the rest of Dockerfile at the time the change was made, so it's not indefensible. 😀

&& \
useradd builder
COPY ./sdk-fetch /usr/local/bin

Expand All @@ -30,8 +55,22 @@ RUN \
apt-get update && \
apt-get -y dist-upgrade && \
apt-get -y install \
autoconf automake bc build-essential cpio curl file git \
libexpat1-dev libtool libz-dev pkgconf python3 unzip wget && \
autoconf \
automake \
bc \
build-essential \
cpio \
curl \
file \
git \
libexpat1-dev \
libtool \
libz-dev \
pkgconf \
python3 \
unzip \
wget \
&& \
useradd -m -u 1000 builder
COPY ./sdk-fetch /usr/local/bin

Expand Down Expand Up @@ -818,11 +857,41 @@ FROM sdk as sdk-plus
USER root
RUN \
dnf -y install --setopt=install_weak_deps=False \
java-11-openjdk-devel maven-openjdk11 maven-local \
maven-clean-plugin maven-shade-plugin \
efitools gnutls-utils gnupg-pkcs11-scd nss-tools \
openssl-pkcs11 pesign python3-virt-firmware sbsigntools \
awscli && \
awscli \
ccache \
createrepo_c \
dosfstools \
e2fsprogs \
efitools \
erofs-utils \
gdisk \
glib2-devel \
gnupg-pkcs11-scd \
gnutls-utils \
java-11-openjdk-devel \
kpartx \
libcap-devel \
lz4 \
maven-clean-plugin \
maven-local \
maven-openjdk11 \
maven-shade-plugin \
mtools \
nss-tools \
openssl-pkcs11 \
pesign \
policycoreutils \
python3-jinja2 \
python3-virt-firmware \
qemu-img \
rpcgen \
rpmdevtools \
sbsigntools \
secilc \
ShellCheck \
squashfs-tools \
veritysetup \
&& \
dnf clean all

# =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
Expand Down