Skip to content
Snippets Groups Projects
Commit 1e9702d3 authored by Alexandru Munteanu's avatar Alexandru Munteanu
Browse files

merge

parents a54dd50e bf4995da
No related branches found
No related tags found
No related merge requests found
FROM xpub/xpub:base FROM xpub/xpub:base
WORKDIR ${HOME}
COPY package.json yarn.lock ./ COPY package.json yarn.lock ./
COPY lerna.json .babelrc .eslintignore .eslintrc .prettierrc .stylelintignore .stylelintrc ./ COPY lerna.json .babelrc .eslintignore .eslintrc .prettierrc .stylelintignore .stylelintrc ./
COPY packages packages COPY packages packages
...@@ -16,7 +18,9 @@ RUN [ "rm", "-rf", "/npm-packages-offline-cache"] ...@@ -16,7 +18,9 @@ RUN [ "rm", "-rf", "/npm-packages-offline-cache"]
ENV NODE_ENV "development" ENV NODE_ENV "development"
# WORKDIR ${HOME}/packages/xpub-faraday WORKDIR ${HOME}/packages/xpub-faraday
# RUN [ "npm", "run", "server "] # RUN [ "npm", "run", "server "]
EXPOSE 3000 EXPOSE 3000
CMD [ "npm", "run", "start-now" ]
\ No newline at end of file
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
"lint:style": "stylelint packages/**/*.scss packages/**/*.css", "lint:style": "stylelint packages/**/*.scss packages/**/*.css",
"precommit": "lint-staged", "precommit": "lint-staged",
"styleguide": "lerna run styleguide", "styleguide": "lerna run styleguide",
"test": "lerna run test" "test": "lerna run test",
"start": "docker-compose up"
}, },
"lint-staged": { "lint-staged": {
"*.js": [ "*.js": [
......
...@@ -76,8 +76,7 @@ ...@@ -76,8 +76,7 @@
"start": "pubsweet start", "start": "pubsweet start",
"start:services": "docker-compose up postgres", "start:services": "docker-compose up postgres",
"server": "pubsweet server", "server": "pubsweet server",
"setupdb-now": "pubsweet setupdb --username admin --email admin@mailinator.com --password admin123 --clobber ./", "start-now": "echo $secret > config/local-development.json && npm run server",
"start-now": "echo $secret > config/local-development.json && npm run setupdb-now && npm run start",
"build": "NODE_ENV=production pubsweet build", "build": "NODE_ENV=production pubsweet build",
"clean": "rm -rf node_modules" "clean": "rm -rf node_modules"
} }
......
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