Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
cefe9ce8
Commit
cefe9ce8
authored
3 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
docker: add meson for CI
Change-Id: I1e8e88f993d8fa66224ea1bcd48d6e9fbcb39d5e
parent
ee1b80d9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/Dockerfile_ubuntu_18.04
+6
-1
6 additions, 1 deletion
docker/Dockerfile_ubuntu_18.04
docker/Dockerfile_ubuntu_20.04
+6
-1
6 additions, 1 deletion
docker/Dockerfile_ubuntu_20.04
with
12 additions
and
2 deletions
docker/Dockerfile_ubuntu_18.04
+
6
−
1
View file @
cefe9ce8
...
...
@@ -68,13 +68,18 @@ RUN add-apt-repository universe && \
libsecp256k1-dev \
libasio-dev \
libexpat1 libexpat1-dev \
lcov gcovr
lcov gcovr \
ninja-build
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
RUN ls -la /usr/include/c++/8/charconv
RUN apt-get install -y python3 python3-pip python3-setuptools \
python3-wheel
RUN pip3 install meson
# Tests framework
RUN apt-get install -y -o Acquire::Retries=10 \
libcppunit-dev \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile_ubuntu_20.04
+
6
−
1
View file @
cefe9ce8
...
...
@@ -72,7 +72,12 @@ RUN add-apt-repository universe && \
libsecp256k1-dev \
libasio-dev \
libexpat1 libexpat1-dev \
lcov gcovr
lcov gcovr \
ninja-build
RUN apt-get install -y python3 python3-pip python3-setuptools \
python3-wheel
RUN pip3 install meson
RUN ls -la /usr/include/c++/8/charconv
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment