Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dhtnet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
dhtnet
Commits
90f8a5ad
Commit
90f8a5ad
authored
1 year ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
Jenkins: use Docker
Change-Id: Id7acbd8e217fc55668c8d1943f0464308fce62bc
parent
1299a0d3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+7
-8
7 additions, 8 deletions
Dockerfile
Jenkinsfile
+4
-1
4 additions, 1 deletion
Jenkinsfile
with
11 additions
and
9 deletions
Dockerfile
+
7
−
8
View file @
90f8a5ad
FROM
ghcr.io/savoirfairelinux/opendht/opendht-alpine:latest
FROM
ghcr.io/savoirfairelinux/opendht/opendht-alpine:latest
as
build
RUN
apk add
--no-cache
\
build-base cmake ninja git wget
\
...
...
@@ -19,9 +19,9 @@ RUN mkdir restinio && cd restinio \
&&
cd
../../..
&&
rm
-rf
restinio
# Build pjproject
RUN
wget https://github.com/savoirfairelinux/pjproject/archive/
e4b83585a0bdf1523e808a4fc1946ec82ac
733
d0
.tar.gz
\
&&
tar
-xzf
e4b83585a0bdf1523e808a4fc1946ec82ac
733
d0
.tar.gz
\
&&
mv
pjproject-
e4b83585a0bdf1523e808a4fc1946ec82ac
733
d0
pjproject
\
RUN
wget https://github.com/savoirfairelinux/pjproject/archive/
97f45c2040c2b0cf6f3349a365b0e900a226
733
3
.tar.gz
\
&&
tar
-xzf
97f45c2040c2b0cf6f3349a365b0e900a226
733
3
.tar.gz
\
&&
mv
pjproject-
97f45c2040c2b0cf6f3349a365b0e900a226
733
3
pjproject
\
&&
cd
pjproject
\
&&
EXCLUDE_APP
=
1 ./aconfigure
--prefix
=
/usr
--disable-sound
\
--enable-video
\
...
...
@@ -50,7 +50,6 @@ COPY . dhtnet
RUN
mkdir
/install
ENV
DESTDIR /install
#RUN cd dhtnet && mkdir build_dev && cd build_dev \
# && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
# -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
# && make -j8 && make install
RUN
cd
dhtnet
&&
mkdir
build_dev
&&
cd
build_dev
\
&&
cmake ..
-DCMAKE_INSTALL_PREFIX
=
/usr
\
&&
make
-j2
&&
make
install
This diff is collapsed.
Click to expand it.
Jenkinsfile
+
4
−
1
View file @
90f8a5ad
...
...
@@ -4,7 +4,10 @@ pipeline {
stages
{
stage
(
'Build'
)
{
steps
{
sh
'mkdir build && cd build && cmake .. && make'
script
{
docker
.
build
(
"dhtnet:${env.BUILD_ID}"
,
"--target build ."
)
sh
"docker run -t --rm dhtnet:${env.BUILD_ID}"
}
}
}
}
...
...
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