Commit de85a427 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige detalles e implementa CI

parent aeaa12ff

.dockerignore

+2 −2
Original line number Diff line number Diff line 
Dockerfile

.*

node_modules

Dockerfile

package-lock.json

README.md
 
.*

.gitlab-ci.yml

0 → 100644
+85 −0
Original line number Diff line number Diff line 
image: redmic/web-gitlab



stages:

  - package

  - test-package



docker-build-commit:

  stage: package

  image: redmic/docker-gitlab

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - branches

  except:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-tag:

  stage: package

  image: redmic/docker-gitlab

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - tags

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



container-scanning-commit:

  stage: test-package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  allow_failure: true

  services:

    - docker:stable-dind

  only:

    - branches

  except:

    - master

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1

    - apk add -U wget ca-certificates

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64

    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



container-scanning-tag:

  stage: test-package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  allow_failure: true

  services:

    - docker:stable-dind

  only:

    - tags

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1

    - apk add -U wget ca-certificates

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64

    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} || true

  artifacts:

    paths: [gl-sast-container-report.json]

app/index.js

+2 −3
Original line number Diff line number Diff line
@@ -33,12 +33,11 @@ function exposeContents(directoryName) { 
}



exposeContents(sitePath);

exposeContents('index.js');

exposeContents('index.css');



app.set('view engine', 'pug')

	.set('views', path.join(__dirname, '..', 'views'))

	.get('/', function(req, res) {



		res.render('index', {

			path: sitePath

		});

package.json

+3 −3
Original line number Diff line number Diff line 
{

  "name": "welcome-static-pages",

  "name": "index-pages",

  "version": "1.0.0",

  "author": "Observatorio Ambiental Granadilla",

  "description": "Welcome static pages generator",

  "description": "Index pages",

  "contributors": [

    {

      "name": "Ignacio Lorenzo García",
@@ -23,7 +23,7 @@ 
  ],

  "repository": {

    "type": "git",

    "url": "https://gitlab.com/redmic-project/static-pages.git"

    "url": "https://gitlab.com/redmic-project/docker/index-pages.git"

  },

  "private": true,

  "scripts": {