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.

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

monk - full text license scanner #2

Closed
wants to merge 29 commits into from
Closed

monk - full text license scanner #2

wants to merge 29 commits into from

Conversation

wuan
Copy link
Member

@wuan wuan commented Jul 4, 2014

This pull request adds another license scanner called monk.

Monk is scanning files and compares their content to the full text of all licenses known to fossology or other text sources.

Monk is based on the following workflow:

  • First both texts are tokenized word by word.
  • Then both texts are compared token by token.
    Monk differentiates between full matches and matches with additions/removal and provides a full diff like view of its result

Currently the performance of monks algorithm is good enough to check every source file agains every known license. Differing from the first proposal in #7065 (see sourceforge) monk can be used as a standalone license scanner and its operation does not depend on e. g. nomos results.

In addition to the monk agent we started to generalize the license browser and viewer, which was extended to show licenses found by different license scanning agents (currently nomos and monk) while browsing the file tree. We would like to gather more feedback from the community as this general license browser might replace agent specific license browsers later.

yaobinshi and others added 29 commits July 15, 2014 16:43
bucket syntax error due to adding specific uploadtree tables in sql
… for licenses matche with a _LT_FREE_x signature)
…igemo, Logica-OSL-1.0, Nvidia , Unidex, Giftware, GPL-3.0+-with-classpath-exception and GPL-2.0+-with-classpath-exception.
…recursively scan a directory), thanks for your testing.
…rn error msg when the licesne shortname is empty.
@wuan
Copy link
Member Author

wuan commented Aug 8, 2014

Merged on sourceforge master

NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
NicolasToussaint referenced this pull request in Orange-OpenSource/fossology May 29, 2020
commit e5cedc6bc2cac6f3a73d7a8279c080d03ae00551
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:42:37 2019 +0100

    un-comment stage 'docker-release-job'

commit 940fddb41c4353bbcf847befdabdab982f8314be
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 09:08:25 2019 +0100

    really configure stage 'docker-audit-clair-job'

commit 78d002fcb19982a30fc53a57c3e7e5bb9c4e868f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Thu Jan 31 08:58:32 2019 +0100

    un-comment security stage 'docker-audit-clair-job'

commit 2e176bf4c1fcbf0acf4e15d8152744a693953881
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 22:23:29 2019 +0100

    Revert "install directly VIM in docker image"

    This reverts commit 42f9bde724aa72b6f7bba68373295988ee841cf2.

commit 42f9bde724aa72b6f7bba68373295988ee841cf2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:54:36 2019 +0100

    install directly VIM in docker image

commit 0b3bf5aabd294358c6a8ead6a557b8eec0886923
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 17:24:07 2019 +0100

    add EXPOSE stanza to Dockerfile

commit 11c8174cda584b9f523c7bf26bc2dd004982ee40
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 16:22:55 2019 +0100

    use appropriate command for the Alipne docker image (apk command)

commit dcfd0a8e487af9c05003c1d673a0e13e839e4d7a
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:52:34 2019 +0100

    Install git

commit a525e49ffe97777c574cd3d7ca408186c0fbac4b
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:47:24 2019 +0100

    Activate Octopus Merge

commit dfed1b1072e90c0467e69d349fb197126a444b70
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:23:29 2019 +0100

    re-disable test stage for now

commit f0aaacdba8b2b3138473f6e516d35d64f92a01df
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 15:10:36 2019 +0100

    un-remove previously un-removede --cache-from option + remove new lines

commit ad8becb7e40dd2ad0b046a7f03bd1c8d9329d181
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:39:25 2019 +0100

    remove un-removed --cache-from option

commit 13c73b2c482e4f0d694f1d733cdb9230bd400400
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:33:40 2019 +0100

    linty: use --permissive option rather than previous hack

commit f66363612fa832a50251396db636248151ad0ad2
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 14:30:29 2019 +0100

    un-remove --cache-from option

commit 2a264f3aa49a6d6ae6ee1dc193615c5681452441
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 12:04:09 2019 +0100

    workaround Lint test errors

commit dfbf11b33e3104d0284f8d2dea1b08134834ec53
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:34:37 2019 +0100

    Remove double Maintener labes

commit 566578911568208865b61c05e2ac9267d1b7f820
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:13:15 2019 +0100

    Try to comply with Dockerfile checking rules

commit f5f7f7c5507dfdbf2345ef41ffdf25199d6d65d1
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:03:12 2019 +0100

    uncomment all Tests sections, fix the stages

commit 4d03b7f64870fc44416badc3699858b2ca4c85ee
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 11:00:04 2019 +0100

    uncomment the Test section

commit f1a33e405bbdc9ed8f391022933423a691f34333
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:44:11 2019 +0100

    fix no_proxy syntax

commit 5566b93a2077524fa9d760eb82778b5118fa13f5
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:38:47 2019 +0100

    docker build fix attempt

commit d12044d619059b761e0ba217739379eb4cdc6596
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:32:21 2019 +0100

    remove --cache-fom in docker build

commit 52d6e51aee27031e95db5a59f5519f0743432462
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:23:54 2019 +0100

    pass proxy context to container build

commit 13a950b474e8391b7447d4116ee4273675fa7c8a
Merge: 5777195c4 fafb96fb2
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Tue Jan 29 09:15:37 2019 +0100

    resolve local conflicts

commit fafb96fb2009111c34342536da8bc02c6b096f96
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Tue Jan 29 09:09:14 2019 +0100

    no proxy for registry.forge.orange-labs.fr

commit 684cd7575c6755e9f1ba771ffa369de93c5c7536
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 18:12:38 2019 +0100

    Add proxy setting

commit ca9d83a1270367fd5565b5f38f96a18e66e524f4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 17:04:10 2019 +0100

    Adapt gitlab-ci file

commit ae4056a67f9c4b5f91c26277baf00c7bd6a719fd
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:57:32 2019 +0100

    remove lint and test stages

commit cd34a4341b284a6483b7bc5ff4b94a1edb0b7be4
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:45:29 2019 +0100

    reuse gitLab-CI from gitlab-ci-docker-image-hello-world branch

commit 49b0729c6b078bf2ec31e82652338a77b47b7b3f
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:27:12 2019 +0100

    tags in build_step_one stage  #2

commit 5777195c487255b64bb4fe1edf6d863aee0ab4ca
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:23:25 2019 +0100

    other changes

commit 0f55061f8f09a66b8f4298f4ba22c814f810819c
Author: bdrozd01 <bartlomiej.drozdz@orange.com>
Date:   Mon Jan 28 16:18:14 2019 +0100

    tags in build_step_one stage

commit 04dffc38e7dafbc05bf6a7d4d493ada50e7d8c09
Author: Toussaint Nicolas <nicolas1.toussaint@orange.com>
Date:   Mon Jan 28 16:10:22 2019 +0100

    build docker image, try #1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants