Skip to content

Commit

Permalink
Merge pull request #9 from phoenix741/feature/serveronly
Browse files Browse the repository at this point in the history
feat: Remove the client part (that will be stored in another project)
  • Loading branch information
phoenix741 authored Oct 21, 2018
2 parents acba877 + af5c606 commit a609bd1
Show file tree
Hide file tree
Showing 181 changed files with 2,786 additions and 27,863 deletions.
27 changes: 0 additions & 27 deletions .babelrc

This file was deleted.

38 changes: 0 additions & 38 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,7 @@
pipeline:
e2e:
group: test
image: node:8
commands:
- npm install
- npm run e2e:docker
environment:
- MONGODB_HOST=mongodb://mongodb:27017/passprotect
- MONGODB_DATABASE=passprotect
- HOST=e2e

unit:
group: test
image: node:8
commands:
- wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
- sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list'
- apt update && apt install -y google-chrome-stable

- npm install
- npm run unit

nodejs:
group: build
image: plugins/docker
repo: phoenix741/passprotect-server
secrets: [ docker_username, docker_password ]
tags: develop
dockerfile: Dockerfile.nodejs

nginx:
group: build
image: plugins/docker
repo: phoenix741/passprotect-client
secrets: [ docker_username, docker_password ]
tags: develop
dockerfile: Dockerfile.nginx

services:
selenium:
image: selenium/standalone-chrome

mongodb:
image: mongo:3.6
8 changes: 0 additions & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,11 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module'
},
env: {
browser: true,
},
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
extends: 'standard',
// required to lint *.vue files
plugins: [
'html'
],
// add your custom rules here
rules: {
// allow async-await
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ selenium-debug.log
# Editor directories and files
.idea
.vscode
.env
*.suo
*.ntvs*
*.njsproj
Expand All @@ -21,4 +22,4 @@ mongodb
.nyc_output
.esm-cache
platforms/
plugins/
plugins/
10 changes: 0 additions & 10 deletions .postcssrc.js

This file was deleted.

6 changes: 3 additions & 3 deletions Dockerfile.nodejs → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# -------- Base ---------

FROM node:8 as base
FROM node:10 as base
MAINTAINER Ulrich Van Den Hekke <[email protected]>

WORKDIR /src
Expand All @@ -18,14 +18,14 @@ RUN npm install --production
# -------- Dist -----------
FROM base AS dist

COPY common ./common
COPY config ./config
COPY server ./server
COPY package.json ./
COPY package-lock.json ./
COPY --from=dependencies /src/node_modules /src/node_modules

ENV MODE=prod
ENV NODE_ENV=production

EXPOSE 3000
CMD ["node", "-r", "@std/esm", "server/app"]
CMD ["node", "--experimental-modules", "server/app"]
31 changes: 0 additions & 31 deletions Dockerfile.nginx

This file was deleted.

46 changes: 0 additions & 46 deletions build/build.js

This file was deleted.

49 changes: 0 additions & 49 deletions build/check-versions.js

This file was deleted.

Binary file removed build/logo.png
Binary file not shown.
20 changes: 0 additions & 20 deletions build/piwik.conf.js

This file was deleted.

101 changes: 0 additions & 101 deletions build/utils.js

This file was deleted.

Loading

0 comments on commit a609bd1

Please sign in to comment.