Skip to content

Commit

Permalink
[docker/third-party] Fix nomos installation
Browse files Browse the repository at this point in the history
This code removes the Dockerfile-fossology and related
entrypoint, and propose to install nomos using the
release 3.8.0 available at
https://github.com/fossology/fossology/releases

Documentation has been updated accordingly.

Signed-off-by: Valerio Cosentino <valcos@bitergia.com>
  • Loading branch information
valeriocos authored and jgbarah committed Jun 3, 2020
1 parent 78dfeea commit 3a3479a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 95 deletions.
58 changes: 0 additions & 58 deletions third-party/Dockerfile-fossology

This file was deleted.

17 changes: 11 additions & 6 deletions third-party/Dockerfile-grimoirelab-3p
Expand Up @@ -9,18 +9,23 @@ MAINTAINER Jesus M. Gonzalez-Barahona <jgb@bitergia.com>

ENV DEBIAN_FRONTEND=noninteractive

ADD build/fossology-common_3.6.0-1_amd64.deb /tmp
ADD build/fossology-nomos_3.6.0-1_amd64.deb /tmp
RUN wget https://github.com/fossology/fossology/releases/download/3.8.1/FOSSology-3.8.0-debian9stretch.tar.gz && \
tar -xzf FOSSology-3.8.0-debian9stretch.tar.gz && rm FOSSology-3.8.0-debian9stretch.tar.gz && \
cp packages/fossology-common_3.8.1-1_amd64.deb /tmp && \
cp packages/fossology-nomos_3.8.1-1_amd64.deb /tmp

RUN rm -rf packages

# install dependencies
RUN sudo apt-get update && \
sudo apt-get -y install /tmp/fossology-common_3.6.0-1_amd64.deb \
/tmp/fossology-nomos_3.6.0-1_amd64.deb \
sudo apt-get -y install /tmp/fossology-common_3.8.1-1_amd64.deb \
/tmp/fossology-nomos_3.8.1-1_amd64.deb \
cloc \
&& \
sudo apt-get clean && \
sudo find /var/lib/apt/lists -type f -delete && \
sudo rm /tmp/fossology-common_3.6.0-1_amd64.deb \
/tmp/fossology-nomos_3.6.0-1_amd64.deb
sudo rm /tmp/fossology-common_3.8.1-1_amd64.deb \
/tmp/fossology-nomos_3.8.1-1_amd64.deb

RUN wget https://github.com/crossminer/crossJadolint/releases/download/Pre-releasev2/jadolint.jar

Expand Down
20 changes: 1 addition & 19 deletions third-party/README.md
Expand Up @@ -39,25 +39,9 @@ attributes = [body]
nlp_rest_url = http://localhost:<Port>
```
## Docker image grimoirelab/fossology-factory
This image is for building the
[Debian packages that are being produced in the Debian mentor program](https://mentors.debian.net/package/fossology).
They are built from source code.
For building them, we create a Docker image
(`grimoirelab/fossology-factory`) and then run it:
```bash
$ docker build -f Dockerfile-fossology -t grimoirelab/fossology-factory .
$ docker run -v $(pwd)/build:/build -t grimoirelab/fossology-factory
```
As a result, all packages (source and binary) are in the build directory.
## Docker image grimoirelab/full-3p
This is a descendant image from grimoirelab/full, with third party tools in it (e.g., nomos, cloc). For instance,
nomos is obtained via the installation of the fosssology-nomos package built with `grimoirelab/fossology-factory`:
This is a descendant image from grimoirelab/full, with third party tools in it (e.g., nomos, cloc).
```
docker build -f Dockerfile-grimoirelab-3p -t grimoirelab/full-3p .
Expand All @@ -71,8 +55,6 @@ dashboard.cfg files and the docker command to run the image.
Clone the repo, create the image and set the working directory
```
git clone https://github.com/chaoss/grimoirelab && cd grimoirelab/third-party
docker build -f Dockerfile-fossology -t grimoirelab/fossology-factory .
docker run -v $(pwd)/build:/build -t grimoirelab/fossology-factory
docker build -f Dockerfile-grimoirelab-3p -t grimoirelab/full-3p .
cd ../default-grimoirelab-settings
```
Expand Down
12 changes: 0 additions & 12 deletions third-party/entrypoint-fossology.sh

This file was deleted.

0 comments on commit 3a3479a

Please sign in to comment.