Commit bca85439 authored by Fulcrand Guilhem's avatar Fulcrand Guilhem
Browse files

Merge branch '199-rename-builder-folder' into 'latest' 

Resolve "Rename "builder" folder"

Closes #199

See merge request r2devops/hub!100
parents 21767629 a59d94cd

.gitlab-ci.yml

+15 −7
Original line number Diff line number Diff line
@@ -8,9 +8,12 @@ include: 
  - remote: 'https://jobs.r2devops.io/0.2.0/pages.yml?scope=0.yml'



mkdocs:

  variables:

    PIPENV_PIPFILE: tools/builder/Pipfile

  before_script:

    - pip3 install -r requirements.txt

    - python3 builder/builder.py

    - pip install pipenv && pipenv install

    - pipenv run python tools/builder/builder.py

    - pip3 install mkdocs-awesome-pages-plugin==2.4.0 # temporary, it will be removed after #202



pages:

  rules:
@@ -34,8 +37,13 @@ release: 
    name: alpine/httpie:2.2.0

    entrypoint: [""]

  stage: deployment

  variables:

    PIPENV_PIPFILE: tools/notify/Pipfile

  before_script:

    - apk update && apk add --no-cache bash

    - pip install pipenv && pipenv install



  script: >

    apk update && apk add --no-cache bash;

    PROJECT_ENCODED=$(/bin/bash -c "$(http --ignore-stdin --body https://gist.githubusercontent.com/cdown/1163649/raw/8a35c36fdd24b373788a7057ed483a5bcd8cd43e/gistfile1.sh) && _encode '$CI_PROJECT_PATH'");



    for JOB in jobs/*; do
@@ -56,7 +64,7 @@ release: 
          else

            if [ $(echo ${result} | grep "Release already exists" | wc -l) -eq 0 ]; then

              echo "New version detected for $JOB, sending notification to discord"

              python3 builder/discord_release_notify.py -n ${JOB} -v ${VERSION}

              pipenv run python tools/notify/discord_release_notify.py -n ${JOB} -v ${VERSION}

            fi



            echo "Processed ${JOB}-${VERSION} : ${result}";

Makefile

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
jobs:

	for job in Jobs/*; do if [ -d ${job} ]; then mkdir -p docs/${job} && cp ${job}/README.md docs/${job}; fi; done

	for doc in docs/Jobs/*; do if [ -d ${doc} ]; then echo 'collapse: true' > ${doc}/.pages; fi; done

Pipelines/kubernetes.gitlab-ci.yml

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
# ############################

# R2Devops DevSecOps template

# ############################

#

# Some variables must be defined in your CI/CD settings

# (https://docs.gitlab.com/ee/ci/variables/#creating-a-custom-environment-variable):

#   * DOCKER_AUTH_CONFIG: docker auth configuration to access R2Devops images

#   * BOT_TOKEN: Secret token of bot user to interact with Gitlab API

#   * TEMPLATES_REPO_PASSWORD: If needed, secret password (or token)

#     with read access to templates repository

#   * PGP_PUBLIC: PGP public key. Use type "file"

#   * PGP_PRIVATE: PGP private key. Use type "file"



image: alpine:latest



variables:

  DOCKER_DRIVER: overlay2

  DOCKER_TLS_CERTDIR: ""  # https://gitlab.com/gitlab-org/gitlab-runner/issues/4501

  # R2Devops global variables

  BOT_USER_ID: '' # TODO: use your own BOT ID

  TEMPLATES_REPO_URL: 'gitlab.com/go2scale/templates.git'

  GITLAB_URL: $CI_SERVER_URL



stages:

  - code_level

  - build

  - review

  - application_level

  - staging

  - production

  - performance



include:

  # Gitlab AutoDevops

  - template: Jobs/Build.gitlab-ci.yml

  - template: Security/Container-Scanning.gitlab-ci.yml

  # R2Devops DevSecOps

  - remote: https://gitlab.com/r2devops/jobs/raw/2020-03-05_3/jobs/quality_check.gitlab-ci.yml

  - remote: https://gitlab.com/r2devops/jobs/raw/2020-03-05_3/jobs/documentation.gitlab-ci.yml

  - remote: https://gitlab.com/r2devops/jobs/raw/2020-03-05_3/jobs/helm.gitlab-ci.yml



container_scanning:

  stage: review

Pipfile

+4 −9
Original line number Diff line number Diff line
@@ -6,17 +6,12 @@ verify_ssl = true 
[dev-packages]



[packages]

mkdocs = "==1.1.2"

pymdown-extensions = "==8.0.1"

mkdocs-material-extensions = "==1.0.1"

mkdocs-minify-plugin = "==0.3.0"

mkdocs-awesome-pages-plugin = "==2.4.0"

mkdocs-git-revision-date-localized-plugin = "==0.7.2"

requests = ">=2.24.0"

Pygments = ">=2.7.1"

Markdown = "==3.3.1"

mkdocs-material = "==6.1.5"

mkdocs-awesome-pages-plugin = "==2.4.0"

pyyaml = "==5.3.1"

mkdocs-material-extensions = "==1.0.1"

mkdocs-minify-plugin = "==0.3.0"



[requires]

python_version = "3.8"
 
python_version = "3"

Pipfile.lock

+13 −65
Original line number Diff line number Diff line 
{

    "_meta": {

        "hash": {

            "sha256": "9731793cce4a390f43110b36acf9746336be458a059d89e4678f2530081a7788"

            "sha256": "0d87b85e161b299977203ec926d3886315e0919718d7172acf16588a4693c853"

        },

        "pipfile-spec": 6,

        "requires": {

            "python_version": "3.8"

            "python_version": "3"

        },

        "sources": [

            {
@@ -21,36 +21,19 @@ 
                "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5",

                "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==2.9.0"

        },

        "certifi": {

            "hashes": [

                "sha256:1f422849db327d534e3d0c5f02a263458c3955ec0aae4ff09b95f195c59f4edd",

                "sha256:f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4"

            ],

            "version": "==2020.11.8"

        },

        "chardet": {

            "hashes": [

                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",

                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"

            ],

            "version": "==3.0.4"

        },

        "click": {

            "hashes": [

                "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a",

                "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",

            "version": "==7.1.2"

        },

        "future": {

            "hashes": [

                "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"

            ],

            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==0.18.2"

        },

        "gitdb": {
@@ -58,7 +41,6 @@ 
                "sha256:91f36bfb1ab7949b3b40e23736db18231bf7593edada2ba5c3a174a7b23657ac",

                "sha256:c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9"

            ],

            "markers": "python_version >= '3.4'",

            "version": "==4.0.5"

        },

        "gitpython": {
@@ -66,7 +48,6 @@ 
                "sha256:6eea89b655917b500437e9668e4a12eabdcf00229a0df1762aabd692ef9b746b",

                "sha256:befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8"

            ],

            "markers": "python_version >= '3.4'",

            "version": "==3.1.11"

        },

        "htmlmin": {
@@ -75,20 +56,11 @@ 
            ],

            "version": "==0.1.12"

        },

        "idna": {

            "hashes": [

                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",

                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==2.10"

        },

        "jinja2": {

            "hashes": [

                "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0",

                "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",

            "version": "==2.11.2"

        },

        "joblib": {
@@ -96,7 +68,6 @@ 
                "sha256:698c311779f347cf6b7e6b8a39bb682277b8ee4aba8cf9507bc0cf4cd4737b72",

                "sha256:9e284edd6be6b71883a63c9b7f124738a3c16195513ad940eae7e3438de885d5"

            ],

            "markers": "python_version >= '3.6'",

            "version": "==0.17.0"

        },

        "jsmin": {
@@ -123,11 +94,10 @@ 
        },

        "markdown": {

            "hashes": [

                "sha256:10db1204a6c4aff7c7cf3cf25cc02761703baea54b6fb5e2b9ce2c186d81116f",

                "sha256:c3ce9ebb035c078cac0f2036068d054e7dc34354eeecc49c173c33c96b124af6"

                "sha256:5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18",

                "sha256:c109c15b7dc20a9ac454c9e6025927d44460b85bd039da028d85e2b6d0bcc328"

            ],

            "index": "pypi",

            "version": "==3.3.1"

            "version": "==3.3.3"

        },

        "markupsafe": {

            "hashes": [
@@ -165,7 +135,6 @@ 
                "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7",

                "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==1.1.1"

        },

        "mkdocs": {
@@ -173,7 +142,6 @@ 
                "sha256:096f52ff52c02c7e90332d2e53da862fde5c062086e1b5356a6e392d5d60f5e9",

                "sha256:f0b61e5402b99d7789efa032c7a74c90a20220a9c81749da06dbfbcbd52ffb39"

            ],

            "index": "pypi",

            "version": "==1.1.2"

        },

        "mkdocs-awesome-pages-plugin": {
@@ -224,11 +192,10 @@ 
        },

        "pygments": {

            "hashes": [

                "sha256:381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0",

                "sha256:88a0bbcd659fcb9573703957c6b9cff9fab7295e6e76db54c9d00ae42df32773"

                "sha256:ccf3acacf3782cbed4a989426012f1c535c9a90d3a7fc3f16d231b9372d2b716",

                "sha256:f275b6c0909e5dafd2d6269a656aa90fa58ebf4a74f8fcf9053195d226b24a08"

            ],

            "index": "pypi",

            "version": "==2.7.2"

            "version": "==2.7.3"

        },

        "pymdown-extensions": {

            "hashes": [
@@ -250,16 +217,17 @@ 
                "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97",

                "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76",

                "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2",

                "sha256:6034f55dab5fea9e53f436aa68fa3ace2634918e8b5994d82f3621c04ff5ed2e",

                "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648",

                "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf",

                "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f",

                "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2",

                "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee",

                "sha256:ad9c67312c84def58f3c04504727ca879cb0013b2517c85a9a253f0cb6380c0a",

                "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d",

                "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c",

                "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"

            ],

            "index": "pypi",

            "version": "==5.3.1"

        },

        "regex": {
@@ -308,20 +276,11 @@ 
            ],

            "version": "==2020.11.13"

        },

        "requests": {

            "hashes": [

                "sha256:7f1a0b932f4a60a1a65caa4263921bb7d9ee911957e0ae4a23a6dd08185ad5f8",

                "sha256:e786fa28d8c9154e6a4de5d46a1d921b8749f8b74e28bde23768e5e16eece998"

            ],

            "index": "pypi",

            "version": "==2.25.0"

        },

        "six": {

            "hashes": [

                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",

                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==1.15.0"

        },

        "smmap": {
@@ -329,7 +288,6 @@ 
                "sha256:54c44c197c819d5ef1991799a7e30b662d1e520f2ac75c9efbeb54a742214cf4",

                "sha256:9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==3.0.4"

        },

        "tornado": {
@@ -376,24 +334,14 @@ 
                "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68",

                "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5"

            ],

            "markers": "python_version >= '3.5'",

            "version": "==6.1"

        },

        "tqdm": {

            "hashes": [

                "sha256:18d6a615aedd09ec8456d9524489dab330af4bd5c2a14a76eb3f9a0e14471afe",

                "sha256:80d9d5165d678dbd027dd102dfb99f71bf05f333b61fb761dbba13b4ab719ead"

            ],

            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",

            "version": "==4.52.0"

        },

        "urllib3": {

            "hashes": [

                "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",

                "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"

                "sha256:38b658a3e4ecf9b4f6f8ff75ca16221ae3378b2e175d846b6b33ea3a20852cf5",

                "sha256:d4f413aecb61c9779888c64ddf0c62910ad56dcbe857d8922bb505d4dbff0df1"

            ],

            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",

            "version": "==1.26.2"

            "version": "==4.54.1"

        }

    },

    "develop": {}