Skip to content

A
atlasvoayages.com
Commit 7a6e3d23 by nabil el mahiri
Options

using npm login

parent f1b74627
Pipeline #424 failed with stages
in 49 seconds
Showing with 40 additions and 39 deletions
.gitlab-ci.yml
......@@ -25,15 +25,15 @@ build:
only:
- master
script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
# Run ssh-agent (inside the build environment)
- eval $(ssh-agent -s)
# Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
- ssh-add <(echo "$SSH_PRIVATE_KEY" | base64 -d)
- mkdir -p ~/.ssh
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
# - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
# # Run ssh-agent (inside the build environment)
# - eval $(ssh-agent -s)
# # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
# - ssh-add <(echo "$SSH_PRIVATE_KEY" | base64 -d)
# - mkdir -p ~/.ssh
# - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- chmod +x sh/run.sh
- docker build --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY" -f docker/Dockerfile -t atlasvoyages-docker:prod .
- docker build --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY" --build-arg CI_JOB_TOKEN="${CI_JOB_TOKEN}" -f docker/Dockerfile -t atlasvoyages-docker:prod .
- sh sh/clean.sh
deploy:
......
docker/Dockerfile
# Stage 0, "build-stage", based on Node.js, to build and compile Angular
FROM ubuntu as build-stage
FROM nodejs:6.11.1 as build-stage
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
......@@ -8,8 +8,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
RUN apt-get install -y supervisor && \
apt-get install -y gnupg2 && apt-get install -y gnupg2 && \
apt-get -yq install ssh && \
apt-get -yq install curl && \
apt-get -yq install ssh
apt-get -yq install curl
ADD ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
......@@ -33,7 +33,7 @@ RUN apt-get update && apt-get -yq install mongodb-org && apt-get -yq install red
RUN mkdir -p /data/db
RUN mongod --fork --syslog
RUN apt-get -yq install expect-dev
# RUN apt-get -yq install expect-dev
# sudo ./mongodb/bin/mongodump --host localhost --port 27017 --db atlasvoyages-dev --out ./
# sudo ./mongodb/bin/mongodump --host localhost --port 27017 --db atlasvoyages-dev --gzip --archive=atlasvoyages-dev.archive
......@@ -46,7 +46,7 @@ WORKDIR /atlasvoyages
COPY package*.json /atlasvoyages/
# RUN npm install --global grunt-cli
RUN npm install --global grunt-cli
# RUN git config --global http.proxy http://<username>:<password>@<proxy-server-url>:<port>
......@@ -54,7 +54,7 @@ COPY package*.json /atlasvoyages/
# RUN echo "//<npm-registry>:8080/:_authToken=KB9DEBiM5vNeGPwinPuj" > ~/.npmrc
# Take an SSH key as a build argument.
ARG SSH_PRIVATE_KEY
# ARG SSH_PRIVATE_KEY
# RUN echo exit 0 > /usr/sbin/policy-rc.d
......@@ -76,13 +76,14 @@ ARG SSH_PRIVATE_KEY
# RUN ssh -T gitlab.com
# RUN ssh -T git@gitlab.com
RUN ssh -T git@labs.atlasvoyages.com
# RUN ssh -T git@labs.atlasvoyages.com
RUN git clone https://nabilelmahiri:arigatou%4065@labs.atlasvoyages.com/pine/theme-atlasvoyages.git -b 0.3-beta-v1
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 npm install --unsafe-perm=true
COPY ./ /atlasvoyages/
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
......
package.json
......@@ -6,27 +6,27 @@
"author": "Fractalite",
"license": "UNLICENSED",
"dependencies": {
"pine": "git+ssh://git@labs.atlasvoyages.com/pine/pine.git#0.3",
"pine-express": "git+ssh://git@labs.atlasvoyages.com/pine/pine-express.git#0.3-dev",
"pine-mongo": "git+ssh://git@labs.atlasvoyages.com/pine/pine-mongo.git#0.3",
"pine-blocks": "git+ssh://git@labs.atlasvoyages.com/pine/pine-blocks.git#0.3",
"pine-angular": "git+ssh://git@labs.atlasvoyages.com/pine/pine-angular.git#0.3",
"pine-access": "git+ssh://git@labs.atlasvoyages.com/pine/pine-access.git#0.3",
"pine-admin": "git+ssh://git@labs.atlasvoyages.com/pine/pine-admin.git#0.3",
"pine-urls": "git+ssh://git@labs.atlasvoyages.com/pine/pine-urls.git#0.3",
"pine-checkout": "git+ssh://git@labs.atlasvoyages.com/pine/pine-checkout.git#0.3",
"pine-analytics": "git+ssh://git@labs.atlasvoyages.com/pine/pine-analytics.git#0.3",
"pine-hermes": "git+ssh://git@labs.atlasvoyages.com/pine-hermes/pine-hermes.git#0.3",
"pine-hermes-air": "git+ssh://git@labs.atlasvoyages.com/pine-hermes/pine-hermes-air.git#0.3-baggage",
"pine-hermes-lodge": "git+ssh://git@labs.atlasvoyages.com/pine-hermes/pine-hermes-lodge.git#0.4-fix-hotel-dest",
"pine-payzone": "git+ssh://git@labs.atlasvoyages.com/pine/pine-payzone.git#0.3",
"pine-payments": "git+ssh://git@labs.atlasvoyages.com/pine/pine-payments.git#0.3",
"pine-i18n": "git+ssh://git@labs.atlasvoyages.com/pine/pine-i18n.git#0.3-newdev",
"pine-avi-extra": "git+ssh://git@labs.atlasvoyages.com/pine/pine-avi-extras.git#master",
"hermes-tour": "git+ssh://git@labs.atlasvoyages.com/tour/hermes-tour.git#v0.2",
"hermes-travel": "git+ssh://git@labs.atlasvoyages.com/pine/pine-travel.git#0.3-beta-v1",
"theme-atlasvoyages": "git+ssh://git@labs.atlasvoyages.com/pine/theme-atlasvoyages.git#0.3-beta-v1",
"pine-redis": "git+ssh://git@labs.atlasvoyages.com/pine/pine-redis.git#0.3-newdev"
"pine": "git+ssh://git@labs.atlasvoyages.com:pine/pine.git#0.3",
"pine-express": "git+ssh://git@labs.atlasvoyages.com:pine/pine-express.git#0.3-dev",
"pine-mongo": "git+ssh://git@labs.atlasvoyages.com:pine/pine-mongo.git#0.3",
"pine-blocks": "git+ssh://git@labs.atlasvoyages.com:pine/pine-blocks.git#0.3",
"pine-angular": "git+ssh://git@labs.atlasvoyages.com:pine/pine-angular.git#0.3",
"pine-access": "git+ssh://git@labs.atlasvoyages.com:pine/pine-access.git#0.3",
"pine-admin": "git+ssh://git@labs.atlasvoyages.com:pine/pine-admin.git#0.3",
"pine-urls": "git+ssh://git@labs.atlasvoyages.com:pine/pine-urls.git#0.3",
"pine-checkout": "git+ssh://git@labs.atlasvoyages.com:pine/pine-checkout.git#0.3",
"pine-analytics": "git+ssh://git@labs.atlasvoyages.com:pine/pine-analytics.git#0.3",
"pine-hermes": "git+ssh://git@labs.atlasvoyages.com:pine-hermes/pine-hermes.git#0.3",
"pine-hermes-air": "git+ssh://git@labs.atlasvoyages.com:pine-hermes/pine-hermes-air.git#0.3-baggage",
"pine-hermes-lodge": "git+ssh://git@labs.atlasvoyages.com:pine-hermes/pine-hermes-lodge.git#0.4-fix-hotel-dest",
"pine-payzone": "git+ssh://git@labs.atlasvoyages.com:pine/pine-payzone.git#0.3",
"pine-payments": "git+ssh://git@labs.atlasvoyages.com:pine/pine-payments.git#0.3",
"pine-i18n": "git+ssh://git@labs.atlasvoyages.com:pine/pine-i18n.git#0.3-newdev",
"pine-avi-extra": "git+ssh://git@labs.atlasvoyages.com:pine/pine-avi-extras.git#master",
"hermes-tour": "git+ssh://git@labs.atlasvoyages.com:tour/hermes-tour.git#v0.2",
"hermes-travel": "git+ssh://git@labs.atlasvoyages.com:pine/pine-travel.git#0.3-beta-v1",
"theme-atlasvoyages": "git+ssh://git@labs.atlasvoyages.com:pine/theme-atlasvoyages.git#0.3-beta-v1",
"pine-redis": "git+ssh://git@labs.atlasvoyages.com:pine/pine-redis.git#0.3-newdev"
},
......
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