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

Add libdbus-1-dev and updated git to docker image #1464

Closed
wants to merge 2 commits into from
Closed

Add libdbus-1-dev and updated git to docker image #1464

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce559ad
Add libdbus-1-dev and updated git to docker image
andy31415 Jul 7, 2020
8e5ce0a
Remove last line - restyler wants to remove it for some reason
andy31415 Jul 7, 2020
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
20 changes: 18 additions & 2 deletions integrations/docker/images/chip-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ VOLUME "/var/source"
RUN set -x \
&& apt-get update \
&& apt-get install -fy \
git \
curl \
jq \
make \
Expand All @@ -24,15 +23,18 @@ RUN set -x \
libssl-dev \
unzip \
wget \
libcurl4-openssl-dev \
libmbedtls-dev \
python-pip \
python3 \
python3-pip \
libdbus-1-dev \
libusb-1.0 \
libncurses5-dev \
libncursesw5-dev \
libnspr4-dev \
libxml2-dev \
gettext \
flex \
bison \
gperf \
Expand All @@ -44,7 +46,7 @@ RUN set -x \
&& : # last line

RUN set -x \
&& pip3 install circleci attrs coloredlogs PyGithub \
&& pip3 install circleci attrs coloredlogs PyGithub pygit \
&& : # last line

# Install newer cmake toolchain
Expand All @@ -60,6 +62,19 @@ RUN set -x \
&& rm cmake-3.17.2.tar.gz \
&& : # last line

# Install newer git version, to allow for github workflow checkout
RUN set -x \
Copy link
Contributor

Choose a reason for hiding this comment

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

I was just updating us to ubuntu:focal, which already has this and an up-to-date cmake

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is that change already in?

I have already built the 0.2.18 image in dockerhub to unblock linux with libdbus-1-dev availability. I am afraid that if we keep the PRs the images and sources become out of sync.

&& wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.27.0.tar.gz \
&& tar xzf git-2.27.0.tar.gz \
&& cd git-2.27.0 \
&& ./configure --prefix=/usr \
&& make -j \
&& make install \
&& cd .. \
&& rm -rf git-2.27.0 \
&& rm git-2.27.0.tar.gz \
&& : # last line

# Install bloat comparison tools
RUN set -x \
&& git clone https://github.com/google/bloaty.git \
Expand All @@ -71,3 +86,4 @@ RUN set -x \
&& cd ../.. \
&& rm -rf bloaty \
&& : # last line

2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.16
0.2.18