Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
90b3c07b
Commit
90b3c07b
authored
Feb 28, 2017
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Split the biboumi dockerfile into two, to be able to disable the cache"
This reverts commit
26eb28dc
.
parent
58b3345f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
63 deletions
+26
-63
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
docker/biboumi/Dockerfile
docker/biboumi/Dockerfile
+25
-5
docker/biboumi/Dockerfile.base
docker/biboumi/Dockerfile.base
+0
-23
docker/biboumi/README.rst
docker/biboumi/README.rst
+0
-20
docker/biboumi/build-docker.sh
docker/biboumi/build-docker.sh
+0
-14
No files found.
.gitlab-ci.yml
View file @
90b3c07b
...
...
@@ -176,5 +176,5 @@ packaging:docker:
before_script
:
[]
script
:
-
docker login -p $DOCKER_PASSWORD -u louiz
-
./docker/biboumi/build-docker.sh louiz
/biboumi
-
docker build -t louiz/biboumi docker
/biboumi
-
docker push louiz/biboumi
docker/biboumi/Dockerfile
View file @
90b3c07b
# This dockerfile uses the image built using Dockerfile.base, and installs
# biboumi in it
FROM
biboumi-base
# This Dockerfile creates a docker image running biboumi
FROM
docker.io/fedora:latest
RUN
dnf
--refresh
install
-y
\
gcc-c++
\
cmake
\
make
\
udns-devel
\
sqlite-devel
\
libuuid-devel
\
expat-devel
\
libidn-devel
\
systemd-devel
\
git
\
python
\
&&
dnf clean all
# Install botan
RUN
git clone https://github.com/randombit/botan.git
&&
cd
botan
&&
./configure.py
--prefix
=
/usr
&&
make
-j8
&&
make
install
&&
ldconfig
&&
rm
-rf
/botan
# Install litesql
RUN
git clone git://git.louiz.org/litesql
&&
mkdir
/litesql/build
&&
cd
/litesql/build
&&
cmake ..
-DCMAKE_INSTALL_PREFIX
=
/usr
&&
make
-j8
&&
cd
/litesql/build
&&
make
install
&&
ldconfig
&&
rm
-rf
/litesql
# Install biboumi
RUN
git clone git://git.louiz.org/biboumi
&&
mkdir
./biboumi/build
&&
cd
./biboumi/build
&&
\
cmake ..
-DCMAKE_INSTALL_PREFIX
=
/usr
\
-DCMAKE_BUILD_TYPE
=
Release
\
...
...
docker/biboumi/Dockerfile.base
deleted
100644 → 0
View file @
58b3345f
# This dockerfile install all the dependencies needing to compile biboumi
FROM docker.io/fedora:latest
RUN dnf --refresh install -y\
gcc-c++\
cmake\
make\
udns-devel\
sqlite-devel\
libuuid-devel\
expat-devel\
libidn-devel\
systemd-devel\
git\
python\
&& dnf clean all
# Install botan
RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && ldconfig && rm -rf /botan
# Install litesql
RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && cd /litesql/build && make install && ldconfig && rm -rf /litesql
docker/biboumi/README.rst
View file @
90b3c07b
...
...
@@ -76,23 +76,3 @@ The database is stored in the /var/lib/biboumi/ directory. If you don’t bind
a local directory to it, the database will be lost when the container is
stopped. If you want to keep your database between each run, bind it with
the -v option, like this: **-v /srv/biboumi/:/var/lib/biboumi**.
Building
--------
This image is built from 2 Dockerfiles:
- Dockerfile.base: builds and installs all the dependencies needed to build and run biboumi
- Dockerfile: builds and installs biboumi itself
The goal is to be able to force the rebuild of biboumi itself (by using
the --no-cache option) without having to rebuild and install all its
dependencies.
The build does not require any file in the build context, everything is
fetched during the build using git or dnf.
To build a biboumi image named “foo/biboumi”, you can run the script:
```
./build-docker.sh foo/biboumi
```
docker/biboumi/build-docker.sh
deleted
100755 → 0
View file @
58b3345f
#!/bin/sh
if
[[
-z
"
$1
"
]]
;
then
echo
"Usage: ./build-docker.sh <image_name>"
echo
"Example: ./build-docker.sh docker.io/coucou/biboumi"
exit
1
fi
directory
=
$(
dirname
$0
)
image_name
=
$1
echo
$directory
docker build
-t
biboumi-base
$directory
-f
$directory
/Dockerfile.base
docker build
-t
$image_name
$directory
-f
$directory
/Dockerfile
--no-cache
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment