diff --git a/docker-compose.yml b/docker-compose.yml index 88ede73b..ac9b0cdd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,9 +19,7 @@ services: - LOG_LEVEL=$LOG_LEVEL working_dir: /paperpod api: - build: - context: . - dockerfile: ./packages/api/Dockerfile + build: . env_file: - .env ports: @@ -78,7 +76,7 @@ services: - .env ports: - $WEB_PORT:$WEB_PORT - command: yarn web dev + command: yarn web dev --port $WEB_PORT volumes: - .:/paperpod environment: diff --git a/dockerfiles/Dockerfile.api b/dockerfiles/Dockerfile.api index ec6e7701..fba51a54 100644 --- a/dockerfiles/Dockerfile.api +++ b/dockerfiles/Dockerfile.api @@ -1,4 +1,4 @@ -FROM buildkite/puppeteer:8.0.0 +FROM node:12-alpine WORKDIR /app diff --git a/packages/api/Dockerfile b/packages/api/Dockerfile deleted file mode 100644 index e1a0e254..00000000 --- a/packages/api/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM buildkite/puppeteer -COPY . /paperpod -WORKDIR /paperpod -ENV PUPPETEER_EXECUTABLE_PATH="/usr/bin/google-chrome-stable" -RUN yarn diff --git a/packages/authentication/src/app.ts b/packages/authentication/src/app.ts index cabbcbb8..b4c2195e 100644 --- a/packages/authentication/src/app.ts +++ b/packages/authentication/src/app.ts @@ -5,7 +5,6 @@ import { subscriptionManagementRoutes } from "./routes/public/subscription-manag import { userRoutes } from "./routes/public/user-routes"; export const publicAuthenticationApp = server.app - .appWithEnvironment( server.app.appWithBodyParser(server.app.appWithCookieParser()) ) diff --git a/packages/converter/__mocks__/puppeteer.ts b/packages/converter/__mocks__/puppeteer.ts deleted file mode 100644 index 96989b3c..00000000 --- a/packages/converter/__mocks__/puppeteer.ts +++ /dev/null @@ -1,30 +0,0 @@ -import faker from "faker"; - -export default { - launch: () => ({ - newPage: () => ({ - goto: () => {}, - waitFor: () => {}, - content: () => ` - - -
-${faker.lorem.paragraphs()}
-${faker.lorem.paragraphs()}
-${faker.lorem.paragraphs()}
-${faker.lorem.paragraphs()}
-${faker.lorem.paragraphs()}
-${faker.lorem.paragraphs()}
- - -