Skip to content

A
atlasvoayages.com
Commit 86244006 by nabil el mahiri
Options

using npm login

parent 3993e49b
Pipeline #435 failed with stages
in 4 minutes 5 seconds
Showing with 41 additions and 64 deletions
.gitlab-ci.yml
...@@ -3,11 +3,11 @@ image: docker ...@@ -3,11 +3,11 @@ image: docker
services: services:
- docker:dind - docker:dind
variables: # variables:
CI_DEBUG_TRACE: "true" # CI_DEBUG_TRACE: "true"
before_script: before_script:
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@labs.atlasvoyages.com/".insteadOf "git@labs.atlasvoyages.com:" # - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@labs.atlasvoyages.com/".insteadOf "git@labs.atlasvoyages.com:"
- docker info - docker info
- echo $CI_BUILD_REF - echo $CI_BUILD_REF
- echo $CI_PROJECT_DIR - echo $CI_PROJECT_DIR
......
docker/Dockerfile
...@@ -8,8 +8,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ ...@@ -8,8 +8,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
RUN apt-get install -y supervisor && \ RUN apt-get install -y supervisor && \
apt-get install -y gnupg2 && apt-get install -y gnupg2 && \ apt-get install -y gnupg2 && apt-get install -y gnupg2 && \
apt-get -yq install ssh && \ apt-get -yq install ssh && \
apt-get -yq install curl && \ apt-get install -y openssh-server
apt-get -yq install find
ADD ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf ADD ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
...@@ -23,7 +22,7 @@ RUN rm -f /etc/nginx/fastcgi.conf /etc/nginx/fastcgi_params && \ ...@@ -23,7 +22,7 @@ RUN rm -f /etc/nginx/fastcgi.conf /etc/nginx/fastcgi_params && \
COPY /nginx/default.conf /etc/nginx/sites-available COPY /nginx/default.conf /etc/nginx/sites-available
COPY /nginx/default.conf /etc/nginx/sites-enabled COPY /nginx/default.conf /etc/nginx/sites-enabled
RUN npm install --global grunt-cli
# RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 # RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
...@@ -38,17 +37,6 @@ COPY /nginx/default.conf /etc/nginx/sites-enabled ...@@ -38,17 +37,6 @@ COPY /nginx/default.conf /etc/nginx/sites-enabled
# sudo ./mongodb/bin/mongodump --host localhost --port 27017 --db atlasvoyages-dev --gzip --archive=atlasvoyages-dev.archive # sudo ./mongodb/bin/mongodump --host localhost --port 27017 --db atlasvoyages-dev --gzip --archive=atlasvoyages-dev.archive
WORKDIR /atlasvoyages
COPY package*.json /atlasvoyages/
RUN npm install --global grunt-cli
# RUN git config --global http.proxy http://<username>:<password>@<proxy-server-url>:<port> # RUN git config --global http.proxy http://<username>:<password>@<proxy-server-url>:<port>
# RUN echo "//<npm-registry>:8080/:_authToken=KB9DEBiM5vNeGPwinPuj" > ~/.npmrc # RUN echo "//<npm-registry>:8080/:_authToken=KB9DEBiM5vNeGPwinPuj" > ~/.npmrc
...@@ -58,7 +46,6 @@ ARG SSH_PRIVATE_KEY ...@@ -58,7 +46,6 @@ ARG SSH_PRIVATE_KEY
ARG BUILD_TOKEN ARG BUILD_TOKEN
# RUN echo exit 0 > /usr/sbin/policy-rc.d # RUN echo exit 0 > /usr/sbin/policy-rc.d
RUN apt-get update && apt-get install -y openssh-server
# 1. Create the SSH directory. # 1. Create the SSH directory.
# 2. Populate the private key file. # 2. Populate the private key file.
# 3. Set the required permissions. # 3. Set the required permissions.
...@@ -79,17 +66,26 @@ RUN ssh -T git@labs.atlasvoyages.com ...@@ -79,17 +66,26 @@ RUN ssh -T git@labs.atlasvoyages.com
# RUN sed -i 's/git+ssh:\/\/git@labs.atlasvoyages.com:/git+https:\/\/oauth2:'$BUILD_TOKEN'@glabs.atlasvoyages.com\//' ./package.json # RUN sed -i 's/git+ssh:\/\/git@labs.atlasvoyages.com:/git+https:\/\/oauth2:'$BUILD_TOKEN'@glabs.atlasvoyages.com\//' ./package.json
# RUN git clone https://nabilelmahiri:arigatou%4065@labs.atlasvoyages.com/pine/theme-atlasvoyages.git -b 0.3-beta-v1 # RUN git clone https://nabilelmahiri:arigatou%4065@labs.atlasvoyages.com/pine/theme-atlasvoyages.git -b 0.3-beta-v1
WORKDIR /atlasvoyages
COPY package*.json /atlasvoyages/
RUN npm install --unsafe-perm=true RUN npm install --unsafe-perm=true
COPY ./ /atlasvoyages/ COPY ./ /atlasvoyages/
WORKDIR /atlasvoyages/node_modules
# RUN expect -f ./sh/npm_login_expect nabilelmahiri arigatou@65 "nabil.elmahiri@fractalite.com" && npm i -S git+http://nabilelmahiri@labs.atlasvoyages.com/pine/pine-express.git#0.3-dev # RUN expect -f ./sh/npm_login_expect nabilelmahiri arigatou@65 "nabil.elmahiri@fractalite.com" && npm i -S git+http://nabilelmahiri@labs.atlasvoyages.com/pine/pine-express.git#0.3-dev
# RUN mongorestore --host localhost --port 27017 --gzip --archive=atlasvoyages-dev.archive # RUN mongorestore --host localhost --port 27017 --gzip --archive=atlasvoyages-dev.archive
RUN find ./node_modules -maxdepth 1 -name 'pine*' -type d \( ! -name . \) -exec bash -c "cd '{}' && npm i --unsafe-perm=true && grunt build:dist" \; \ RUN find . -maxdepth 1 -name 'pine*' -type d \( ! -name . \) -exec bash -c "cd '{}' && npm i --unsafe-perm=true && grunt build:dist" \; \
find ./node_modules -maxdepth 1 -name 'hermes*' -type d \( ! -name . \) -exec bash -c "cd '{}' && npm i --unsafe-perm=true && grunt build:dist" \; \ find . -maxdepth 1 -name 'hermes*' -type d \( ! -name . \) -exec bash -c "cd '{}' && npm i --unsafe-perm=true && grunt build:dist" \; \
find ./node_modules -maxdepth 1 -name 'theme-atlasvoyages*' -type d \( ! -name . \) -exec bash -c "cd '{}' && npm i --unsafe-perm=true && grunt build:dist" \; find . -maxdepth 1 -name 'theme-atlasvoyages*' -type d \( ! -name . \) -exec bash -c "cd '{}' && npm i --unsafe-perm=true && grunt build:dist" \;
WORKDIR /atlasvoyages
RUN echo '\n' | grunt pine:setup RUN echo '\n' | grunt pine:setup
......
package.json
...@@ -6,51 +6,31 @@ ...@@ -6,51 +6,31 @@
"author": "Fractalite", "author": "Fractalite",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"pine": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine.git#0.3", "pine": "git+ssh://git@labs.atlasvoyages.com:pine/pine.git#0.3",
"pine-express": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-express.git#0.3-dev", "pine-express": "git+ssh://git@labs.atlasvoyages.com:pine/pine-express.git#0.3-dev",
"pine-mongo": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-mongo.git#0.3", "pine-mongo": "git+ssh://git@labs.atlasvoyages.com:pine/pine-mongo.git#0.3",
"pine-blocks": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-blocks.git#0.3", "pine-blocks": "git+ssh://git@labs.atlasvoyages.com:pine/pine-blocks.git#0.3",
"pine-angular": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-angular.git#0.3", "pine-angular": "git+ssh://git@labs.atlasvoyages.com:pine/pine-angular.git#0.3",
"pine-access": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-access.git#0.3", "pine-access": "git+ssh://git@labs.atlasvoyages.com:pine/pine-access.git#0.3",
"pine-admin": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-admin.git#0.3", "pine-admin": "git+ssh://git@labs.atlasvoyages.com:pine/pine-admin.git#0.3",
"pine-urls": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-urls.git#0.3", "pine-urls": "git+ssh://git@labs.atlasvoyages.com:pine/pine-urls.git#0.3",
"pine-checkout": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-checkout.git#0.3", "pine-checkout": "git+ssh://git@labs.atlasvoyages.com:pine/pine-checkout.git#0.3",
"pine-analytics": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-analytics.git#0.3", "pine-analytics": "git+ssh://git@labs.atlasvoyages.com:pine/pine-analytics.git#0.3",
"pine-hermes": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine-hermes/pine-hermes.git#0.3", "pine-hermes": "git+ssh://git@labs.atlasvoyages.com:pine-hermes/pine-hermes.git#0.3",
"pine-hermes-air": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine-hermes/pine-hermes-air.git#0.3-baggage", "pine-hermes-air": "git+ssh://git@labs.atlasvoyages.com:pine-hermes/pine-hermes-air.git#0.3-baggage",
"pine-hermes-lodge": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine-hermes/pine-hermes-lodge.git#0.4-fix-hotel-dest", "pine-hermes-lodge": "git+ssh://git@labs.atlasvoyages.com:pine-hermes/pine-hermes-lodge.git#0.4-fix-hotel-dest",
"pine-payzone": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-payzone.git#0.3", "pine-payzone": "git+ssh://git@labs.atlasvoyages.com:pine/pine-payzone.git#0.3",
"pine-payments": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-payments.git#0.3", "pine-payments": "git+ssh://git@labs.atlasvoyages.com:pine/pine-payments.git#0.3",
"pine-i18n": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-i18n.git#0.3-newdev", "pine-i18n": "git+ssh://git@labs.atlasvoyages.com:pine/pine-i18n.git#0.3-newdev",
"pine-avi-extra": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-avi-extras.git#master", "pine-avi-extra": "git+ssh://git@labs.atlasvoyages.com:pine/pine-avi-extras.git#master",
"hermes-tour": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/tour/hermes-tour.git#v0.2", "hermes-tour": "git+ssh://git@labs.atlasvoyages.com:tour/hermes-tour.git#v0.2",
"hermes-travel": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-travel.git#0.3-beta-v1", "hermes-travel": "git+ssh://git@labs.atlasvoyages.com:pine/pine-travel.git#0.3-beta-v1",
"theme-atlasvoyages": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/theme-atlasvoyages.git#0.3-beta-v1", "theme-atlasvoyages": "git+ssh://git@labs.atlasvoyages.com:pine/theme-atlasvoyages.git#0.3-beta-v1",
"pine-redis": "git+http://nabilelmahiri:_uLszKm2QvRcG_GCojPj@labs.atlasvoyages.com/pine/pine-redis.git#0.3-newdev", "pine-redis": "git+ssh://git@labs.atlasvoyages.com:pine/pine-redis.git#0.3-newdev"
"async": "^0.7.0",
"connect-redis": "1.4.7",
"extend": "~1.2.1",
"grunt-contrib-copy": "~0.5.0",
"grunt-newer": "~0.7.0",
"jayschema": "~0.2.7",
"q": "^1.1.2",
"request": "^2.55.0",
"simple-lru-cache": "^0.0.1",
"winston": "^0.7.2"
}, },
"devDependencies": { "devDependencies": {
"grunt": "~0.4.4",
"grunt-bump": "0.0.13",
"grunt-concurrent": "~0.5.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-exit": "~1.0.0",
"grunt-nodemon": "~0.3.0",
"grunt-prompt": "^1.3.0",
"grunt-shell": "~0.7.0",
"handlebars": "^2.0.0",
"load-grunt-tasks": "~0.3.0",
"nginx-conf": "~0.2.3",
"parent-require": "~1.0.0"
} }
} }
\ No newline at end of file
Markdown is supported
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