Commit 7de7a40f authored by Alejandro De Maria Antolinos's avatar Alejandro De Maria Antolinos
Browse files

It references icat/doi-landing-page#7

parent 9b7ceca0
image: docker:latest
stages:
- build
- deploy
build:
stage: build
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- docker image tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:latest"
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- docker push "$CI_REGISTRY_IMAGE:latest"
except:
- master
deploy_production:
stage: deploy
script:
- export http_proxy=http://proxy.esrf.fr:3128
- 'which ssh-agent || ( apk update && apk add openssh-client )'
- eval $(ssh-agent -s)
- echo "$SSH_DEPLOY_KEY_PROD" | ssh-add -
- mkdir -p ~/.ssh
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
- ssh -l gitlab-deploy "$DEPLOY_HOST" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
environment:
name: production
url: http://doi.esrf.fr/
when: manual
except:
- master
RewriteEngine On
#RewriteRule "^index.html/(.*)$" "doi-landing-page/index.html?DOI=$1"
#RewriteRule "/(.*)$" "doi-landing-page/index.html?DOI=$1"
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !(js)
#RewriteCond %{REQUEST_URI} !(doi-landing-page)
RewriteRule "/(.+)$" "index.html?DOI=$1" [NC,L] # Handle product requests
FROM httpd:2.4
MAINTAINER Alejandro DE MARIA <demariaa@esrf.fr>
ENV http_proxy http://proxy.esrf.fr:3128
ENV https_proxy https://proxy.esrf.fr:3128
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update
RUN apt-get install apache2 -y
ADD www /var/www/html/
0 info it worked if it ends with ok
1 verbose cli [ '/usr/bin/nodejs',
1 verbose cli '/usr/bin/npm',
1 verbose cli 'install',
1 verbose cli 'grunt-insert',
1 verbose cli '--save' ]
2 info using npm@1.4.21
3 info using node@v0.10.29
4 warn package.json doi-landing-page@0.0.0 No description
5 warn package.json doi-landing-page@0.0.0 No README data
6 verbose readDependencies using package.json deps
7 verbose cache add [ 'grunt-insert', null ]
8 verbose cache add name=undefined spec="grunt-insert" args=["grunt-insert",null]
9 verbose parsed url { protocol: null,
9 verbose parsed url slashes: null,
9 verbose parsed url auth: null,
9 verbose parsed url host: null,
9 verbose parsed url port: null,
9 verbose parsed url hostname: null,
9 verbose parsed url hash: null,
9 verbose parsed url search: null,
9 verbose parsed url query: null,
9 verbose parsed url pathname: 'grunt-insert',
9 verbose parsed url path: 'grunt-insert',
9 verbose parsed url href: 'grunt-insert' }
10 silly lockFile 6a16fb4d-grunt-insert grunt-insert
11 verbose lock grunt-insert /users/demariaa/.npm/6a16fb4d-grunt-insert.lock
12 silly lockFile 6a16fb4d-grunt-insert grunt-insert
13 silly lockFile 6a16fb4d-grunt-insert grunt-insert
14 verbose addNamed [ 'grunt-insert', '' ]
15 verbose addNamed [ null, '*' ]
16 silly lockFile e2629ca7-grunt-insert grunt-insert@
17 verbose lock grunt-insert@ /users/demariaa/.npm/e2629ca7-grunt-insert.lock
18 silly addNameRange { name: 'grunt-insert', range: '*', hasData: false }
19 verbose request where is /grunt-insert
20 verbose request registry https://registry.npmjs.org/
21 verbose request id b08254c7f12aca69
22 verbose url raw /grunt-insert
23 verbose url resolving [ 'https://registry.npmjs.org/', './grunt-insert' ]
24 verbose url resolved https://registry.npmjs.org/grunt-insert
25 verbose request where is https://registry.npmjs.org/grunt-insert
26 info trying registry request attempt 1 at 15:07:13
27 verbose etag "52aa504a-1a9d"
28 http GET https://registry.npmjs.org/grunt-insert
29 http 304 https://registry.npmjs.org/grunt-insert
30 silly registry.get cb [ 304,
30 silly registry.get { date: 'Wed, 13 Dec 2017 14:07:14 GMT',
30 silly registry.get via: '1.1 varnish',
30 silly registry.get 'cache-control': 'max-age=300',
30 silly registry.get etag: '"52aa504a-1a9d"',
30 silly registry.get age: '35',
30 silly registry.get connection: 'keep-alive',
30 silly registry.get 'x-served-by': 'cache-cdg8721-CDG',
30 silly registry.get 'x-cache': 'HIT',
30 silly registry.get 'x-cache-hits': '1',
30 silly registry.get 'x-timer': 'S1513174034.009346,VS0,VE1',
30 silly registry.get vary: 'Accept-Encoding, Accept' } ]
31 verbose etag https://registry.npmjs.org/grunt-insert from cache
32 silly addNameRange number 2 { name: 'grunt-insert', range: '*', hasData: true }
33 silly addNameRange versions [ 'grunt-insert', [ '0.1.0' ] ]
34 verbose addNamed [ 'grunt-insert', '0.1.0' ]
35 verbose addNamed [ '0.1.0', '0.1.0' ]
36 silly lockFile 59aac559-grunt-insert-0-1-0 grunt-insert@0.1.0
37 verbose lock grunt-insert@0.1.0 /users/demariaa/.npm/59aac559-grunt-insert-0-1-0.lock
38 silly lockFile 59aac559-grunt-insert-0-1-0 grunt-insert@0.1.0
39 silly lockFile 59aac559-grunt-insert-0-1-0 grunt-insert@0.1.0
40 silly lockFile e2629ca7-grunt-insert grunt-insert@
41 silly lockFile e2629ca7-grunt-insert grunt-insert@
42 silly resolved [ { name: 'grunt-insert',
42 silly resolved description: 'Insert code from one file into another.',
42 silly resolved version: '0.1.0',
42 silly resolved homepage: 'https://github.com/grunt-insert',
42 silly resolved author:
42 silly resolved { name: 'Jamie Popkin',
42 silly resolved email: 'popkinj@littleearth.ca',
42 silly resolved url: 'http://littleearth.ca' },
42 silly resolved repository: { type: 'git', url: 'git://github.com/grunt-insert' },
42 silly resolved bugs: { url: 'https://github.com/grunt-insert/issues' },
42 silly resolved licenses: [ [Object] ],
42 silly resolved main: 'Gruntfile.js',
42 silly resolved engines: { node: '>= 0.8.0' },
42 silly resolved scripts: { test: 'grunt test' },
42 silly resolved devDependencies:
42 silly resolved { 'grunt-contrib-jshint': '~0.6.0',
42 silly resolved 'grunt-contrib-clean': '~0.4.0',
42 silly resolved 'grunt-contrib-nodeunit': '~0.2.0',
42 silly resolved grunt: '~0.4.1' },
42 silly resolved peerDependencies: { grunt: '~0.4.1' },
42 silly resolved keywords: [ 'gruntplugin', 'insert', 'build', 'merge', 'concatenate' ],
42 silly resolved readme: '# grunt-insert\n\n> Insert code from one file into another.\n\nUseful when you want to build a single file containing everything it needs for initial rendering. Such as on mobile, where the number of requests directly effects user experience.\nAt the moment it only overwrites the destination file. So be careful to consider that in the build process.\n\n## Getting Started\nThis plugin requires Grunt `~0.4.1`\n\nIf you haven\'t used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you\'re familiar with that process, you may install this plugin with this command:\n\n```shell\nnpm install grunt-insert --save-dev\n```\n\nOnce the plugin has been installed, it may be enabled inside your Gruntfile with this line of JavaScript:\n\n```js\ngrunt.loadNpmTasks(\'grunt-insert\');\n```\n\n## The "insert" task\n\n### Overview\nIn your project\'s Gruntfile, add a section named `insert` to the data object passed into `grunt.initConfig()`.\n\n```js\ngrunt.initConfig({\n insert: {\n options: {\n // Task-specific options go here.\n },\n your_target: {\n // Target-specific file lists and/or options go here.\n },\n },\n});\n```\n\n### Options\n\n**This doesn\'t exist yet.**\n#### options.backup\nType: `Boolean`\nDefault value: false\n\nAll for a backup file to be written for each build. It stores the original file before any and all injections.\n\n### Usage Examples\n\n#### Default Options\nIn this example the javascript is contained in a separate file for development purposes. Then stuffed in the *script* tag of the html file.\n\n```js\ngrunt.initConfig({\n insert: {\n options: {},\n\t main: {\n\t\tsrc: "lib/js/stuff.js",\n\t\tdest: "dist/html/index.html",\n\t\tmatch: "//Stuff it here"\n\t},\n },\n});\n```\n\nThen in the destination file ,*index.html*, make sure you place the *match* string wherever you want source code to be placed. It could look something like this\n```html\n<!doctype html>\n<html>\n\t<head>\n\t\t<script>\n\t\t\t//Stuff it here\n\t\t</script>\n\t</head>\n\t<body>\n\t\tBlah blah.\n\t</body>\n</html>\n```\n\n## Contributing\nIn lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).\n\n## Release History\n_(Nothing yet)_\n',
42 silly resolved readmeFilename: 'README.md',
42 silly resolved _id: 'grunt-insert@0.1.0',
42 silly resolved dist:
42 silly resolved { shasum: '3b2d2b1728db73a3c173f27ae15c0e7034be3221',
42 silly resolved tarball: 'https://registry.npmjs.org/grunt-insert/-/grunt-insert-0.1.0.tgz' },
42 silly resolved _from: 'grunt-insert@',
42 silly resolved _npmVersion: '1.3.1',
42 silly resolved _npmUser: { name: 'popkinj', email: 'popkinj@littleearth.ca' },
42 silly resolved maintainers: [ [Object] ],
42 silly resolved directories: {},
42 silly resolved _shasum: '3b2d2b1728db73a3c173f27ae15c0e7034be3221',
42 silly resolved _resolved: 'https://registry.npmjs.org/grunt-insert/-/grunt-insert-0.1.0.tgz' } ]
43 info install grunt-insert@0.1.0 into /opt2/apache-tomcat-7.0.67/webapps/doi-landing-page
44 info installOne grunt-insert@0.1.0
45 verbose node_modules/grunt-insert unbuild
46 info preuninstall grunt-insert@0.1.0
47 info uninstall grunt-insert@0.1.0
48 verbose true,/opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules,/opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules unbuild grunt-insert@0.1.0
49 info postuninstall grunt-insert@0.1.0
50 verbose tar unpack /users/demariaa/.npm/grunt-insert/0.1.0/package.tgz
51 silly lockFile 5e01aa29-g-page-node-modules-grunt-insert tar:///opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules/grunt-insert
52 verbose lock tar:///opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules/grunt-insert /users/demariaa/.npm/5e01aa29-g-page-node-modules-grunt-insert.lock
53 silly lockFile ae01df02-m-grunt-insert-0-1-0-package-tgz tar:///users/demariaa/.npm/grunt-insert/0.1.0/package.tgz
54 verbose lock tar:///users/demariaa/.npm/grunt-insert/0.1.0/package.tgz /users/demariaa/.npm/ae01df02-m-grunt-insert-0-1-0-package-tgz.lock
55 silly gunzTarPerm modes [ '755', '644' ]
56 silly gunzTarPerm extractEntry package.json
57 silly gunzTarPerm extractEntry .npmignore
58 silly gunzTarPerm extractEntry README.md
59 silly gunzTarPerm extractEntry Gruntfile.js
60 silly gunzTarPerm extractEntry .jshintrc
61 silly gunzTarPerm extractEntry LICENSE-MIT
62 silly gunzTarPerm extractEntry tasks/insert.js
63 silly gunzTarPerm extractEntry test/injector_test.js
64 silly gunzTarPerm extractEntry test/expected/custom_options
65 silly gunzTarPerm extractEntry test/expected/default_options
66 silly gunzTarPerm extractEntry test/fixtures/123
67 silly gunzTarPerm extractEntry test/fixtures/testing
68 silly lockFile 5e01aa29-g-page-node-modules-grunt-insert tar:///opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules/grunt-insert
69 silly lockFile 5e01aa29-g-page-node-modules-grunt-insert tar:///opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules/grunt-insert
70 silly lockFile ae01df02-m-grunt-insert-0-1-0-package-tgz tar:///users/demariaa/.npm/grunt-insert/0.1.0/package.tgz
71 silly lockFile ae01df02-m-grunt-insert-0-1-0-package-tgz tar:///users/demariaa/.npm/grunt-insert/0.1.0/package.tgz
72 info preinstall grunt-insert@0.1.0
73 verbose readDependencies using package.json deps
74 verbose readDependencies using package.json deps
75 silly resolved []
76 verbose about to build /opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules/grunt-insert
77 info build /opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules/grunt-insert
78 verbose linkStuff [ false,
78 verbose linkStuff false,
78 verbose linkStuff false,
78 verbose linkStuff '/opt2/apache-tomcat-7.0.67/webapps/doi-landing-page/node_modules' ]
79 info linkStuff grunt-insert@0.1.0
80 verbose linkBins grunt-insert@0.1.0
81 verbose linkMans grunt-insert@0.1.0
82 verbose rebuildBundles grunt-insert@0.1.0
83 info install grunt-insert@0.1.0
84 info postinstall grunt-insert@0.1.0
85 verbose readDependencies using package.json deps
86 verbose already installed skipping grunt@~0.4.1 /opt2/apache-tomcat-7.0.67/webapps/doi-landing-page
87 silly resolved []
88 error peerinvalid The package grunt does not satisfy its siblings' peerDependencies requirements!
88 error peerinvalid Peer grunt-contrib-jshint@1.1.0 wants grunt@>=0.4.0
88 error peerinvalid Peer grunt-dustjs@1.4.0 wants grunt@>=0.4.0
88 error peerinvalid Peer grunt-wiredep@3.0.1 wants grunt@>=0.4.0
88 error peerinvalid Peer grunt-insert@0.1.0 wants grunt@~0.4.1
89 error System Linux 4.8.0-0.bpo.2-amd64
90 error command "/usr/bin/nodejs" "/usr/bin/npm" "install" "grunt-insert" "--save"
91 error cwd /opt2/apache-tomcat-7.0.67/webapps/doi-landing-page
92 error node -v v0.10.29
93 error npm -v 1.4.21
94 error code EPEERINVALID
95 verbose exit [ 1, true ]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment