From 2696a54d176dd8821be97881447e075c05f9e8fb Mon Sep 17 00:00:00 2001 From: Amruth Pillai Date: Mon, 7 Mar 2022 23:09:14 +0100 Subject: [PATCH] fix(playwright): use playwright docker image due to runtime error --- docker-compose.prod.yml | 23 +++++++++++++++++++++++ package.json | 8 ++++---- server/Dockerfile | 8 +------- 3 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 docker-compose.prod.yml diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 00000000..78b41222 --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,23 @@ +version: '3' + +services: + server: + image: amruthpillai/reactive-resume:server-latest + container_name: server + env_file: .env + ports: + - 3100:3100 + depends_on: + - postgres + + client: + image: amruthpillai/reactive-resume:client-latest + container_name: client + env_file: .env + ports: + - 3000:3000 + depends_on: + - server + +volumes: + pgdata: diff --git a/package.json b/package.json index 83a6fde8..2b139fed 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,14 @@ "dev:schema": "pnpm -F schema dev", "dev:server": "pnpm -F server start:dev", "dev:client": "pnpm -F client dev", - "dev": "env-cmd concurrently --kill-others \"pnpm run dev:*\"", + "dev": "env-cmd --silent concurrently --kill-others \"pnpm run dev:*\"", "build:schema": "pnpm -F schema build", "build:server": "pnpm -F server build", "build:client": "pnpm -F client build", - "build": "env-cmd concurrently \"pnpm run build:*\"", + "build": "env-cmd --silent concurrently \"pnpm run build:*\"", "start:server": "pnpm -F server start:prod", - "start:client": "env-cmd pnpm -F client start", - "start": "env-cmd concurrently --kill-others \"pnpm run start:*\"" + "start:client": "pnpm -F client start", + "start": "env-cmd --silent concurrently --kill-others \"pnpm run start:*\"" }, "dependencies": { "concurrently": "^7.0.0", diff --git a/server/Dockerfile b/server/Dockerfile index 64ebecb4..ebd600db 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -27,16 +27,10 @@ COPY --from=dependencies /app/server/node_modules ./server/node_modules RUN pnpm run build:schema RUN pnpm run build:server -FROM ubuntu:focal as production +FROM mcr.microsoft.com/playwright:focal as production WORKDIR /app -RUN apt-get update \ - && apt-get install -y curl g++ make \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash \ - && apt-get install -y nodejs \ - && PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npx playwright install-deps chromium - RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm COPY --from=builder /app/pnpm-*.yaml .