Commit a33f4c25 authored by chickahoona's avatar chickahoona

progress to gitlab-ci

parent 05b43aba
......@@ -7,28 +7,32 @@ variables:
CONTAINER_RELEASE_IMAGE: registry.gitlab.com/psono/psono-client:latest
stages:
- build
- test
- build
- release
- deploy
job-run-unittests:
stage: test
script:
- sh build.sh
- karma start ./unittests/karma-phantom.conf.js
job-build-container:
stage: build
image: docker:git
services:
- docker:dind
script:
- sh build.sh
- docker build -t $CONTAINER_TEST_IMAGE .
- docker push $CONTAINER_TEST_IMAGE
job-run-unittests:
stage: test
image: docker:git
services:
- docker:dind
script:
- docker pull $CONTAINER_TEST_IMAGE
- docker run $CONTAINER_TEST_IMAGE bash -c "karma start ./unittests/karma-phantom.conf.js"
- gulp xpiunsigned
- cd build/firefox && zip -r ../../psono.PW.chrome.zip . && cd ../..
artifacts:
paths:
- dist/firefox/psono.PW.unsigned.xpi
- psono.PW.chrome.zip
job-release-docker:
stage: release
......
FROM ubuntu:16.04
ENV DEBIAN_FRONTEND noninteractive
FROM nginx:alpine
MAINTAINER Sascha Pfeiffer <saschapfeiffer@psono.com>
COPY . /root/
WORKDIR /root
RUN sh build.sh
\ No newline at end of file
COPY ./src/common/data /usr/share/nginx/html/
WORKDIR /root
\ No newline at end of file
#!/usr/bin/env bash
apt-get update && \
apt-get install -y nodejs npm && \
apt-get install -y nodejs npm zip && \
ln -s /usr/bin/nodejs /usr/bin/node && \
npm install && \
npm install gulp -g && \
......
......@@ -45,7 +45,7 @@
</ul>
<ul class="navigations" ng-if="!datastore.search">
<li><a href="#" ng-click="openTab('/data/datastore.html')">Open Datastore</a></li>
<li><a href="#" ng-click="openTab('/data/index.html')">Open Datastore</a></li>
<li><a href="#" ng-click="generatePassword()">Generate Password</a></li>
<li><a href="https://www.psono.pw/help" target="_blank">Help</a></li>
......
......@@ -234,7 +234,7 @@ var secondMenuItem = contextMenu.Menu({
mod.PageMod({
include: [
self.data.url("./activate.html*"),
self.data.url("./datastore.html*"),
self.data.url("./index.html*"),
self.data.url("./main.html*"),
self.data.url("./open-secret.html*"),
self.data.url("./register.html*"),
......
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