Merge pull request #2975 from omnivore-app/fix/upgrade-lerna-docker-containers

Upgrade lerna and some base docker images off of alpine

lerna.json

@@ -3,6 +3,5 @@
     "packages/*"
   ],
   "version": "1.0.0",
-  "npmClient": "yarn",
-  "useWorkspaces": true
-}
+  "npmClient": "yarn"
+}

package.json

@@ -31,7 +31,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "graphql": "^15.3.0",
     "graphql-tag": "^2.11.0",
-    "lerna": "^4.0.0",
+    "lerna": "^7.4.1",
     "prettier": "^2.5.1",
     "typescript": "^4.4.3"
   },

packages/api/Dockerfile

@@ -1,9 +1,10 @@
-FROM node:18.16-alpine as builder
+FROM node:18.16 as builder
 
 WORKDIR /app
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-RUN apk add g++ make python3
+RUN apt-get update && apt-get install -y g++ make python3
+
 
 COPY package.json .
 COPY yarn.lock .
@@ -32,7 +33,7 @@ RUN rm -rf /app/packages/api/node_modules
 RUN rm -rf /app/node_modules
 RUN yarn install --pure-lockfile --production
 
-FROM node:18.16-alpine as runner
+FROM node:18.16 as runner
 
 WORKDIR /app
 

packages/content-fetch/Dockerfile

@@ -1,13 +1,9 @@
-FROM node:18.16-alpine
+FROM node:18.16
 
 # Installs latest Chromium (92) package.
-RUN apk add --no-cache \
+RUN apt-get update && apt-get install -y \
     chromium \
-    nss \
-    freetype \
-    harfbuzz \
     ca-certificates \
-    ttf-freefont \
     nodejs \
     yarn \
     g++ \

packages/db/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.16-alpine
+FROM node:18.16
 
 WORKDIR /app
 
@@ -8,7 +8,9 @@ COPY tsconfig.json .
 
 COPY /packages/db/package.json ./packages/db/package.json
 
-RUN apk --no-cache --virtual build-dependencies add postgresql uuidgen
+RUN apt-get update && apt-get install -y \
+  postgresql \
+  uuid-runtime
 
 RUN yarn install
 

packages/web/Dockerfile

@@ -12,6 +12,8 @@ ENV NEXT_PUBLIC_BASE_URL=$BASE_URL
 ENV NEXT_PUBLIC_SERVER_BASE_URL=$SERVER_BASE_URL
 ENV NEXT_PUBLIC_HIGHLIGHTS_BASE_URL=$HIGHLIGHTS_BASE_URL
 
+RUN apk add g++ make python3
+
 WORKDIR /app
 
 COPY package.json .