improve docker layer caching for faster container builds (#1379)

* merge duplicate dockerfiles for monolith, better first yarn install layer caching

* slightly better layer caching for building `ott-common`, `ott-client`, `ott-server`

Author: dyc3

.dockerignore

@@ -11,10 +11,12 @@ dist/
 client/dist/
 client/coverage/
 server/coverage/
+common/ts-out/
+server/ts-out/
 .git/
 .optic/
 node_modules/
 benchmarks/
 target/
 .slugignore
-ts-out
+ts-out

deploy/fly.prod.monolith.toml

@@ -4,6 +4,7 @@ kill_timeout = 15
 
 [build]
 dockerfile = "monolith.Dockerfile"
+build-target = "deploy-stage"
 
 [build.args]
 DEPLOY_TARGET = "ott-prod"

deploy/fly.staging.monolith.toml

@@ -4,6 +4,7 @@ kill_timeout = 15
 
 [build]
 dockerfile = "monolith.Dockerfile"
+build-target = "deploy-stage"
 
 [build.args]
 DEPLOY_TARGET = "ott-staging"

deploy/monolith.Dockerfile

@@ -1,35 +1,60 @@
+# Optimized for layer cache hits to speed up builds
+
+FROM node:18-alpine3.19 as dep-install-stage
+
+WORKDIR /app
+RUN apk update -q && apk --no-cache add libc6-compat python3 make g++ autoconf automake libtool -q
+COPY package.json yarn.lock ./
+COPY common/package.json common/
+COPY client/package.json client/
+COPY server/package.json server/
+RUN yarn install --frozen-lockfile
+
 FROM node:18-alpine3.19 as build-stage
 ARG GIT_COMMIT
 ENV GIT_COMMIT=$GIT_COMMIT
 
-WORKDIR /usr/app
-
+WORKDIR /app
 RUN apk update -q && apk --no-cache add libc6-compat python3 make g++ autoconf automake libtool -q
-COPY . .
-RUN yarn
-RUN yarn run build
-
+COPY tsconfig.json ./
+COPY common common
+COPY client client
+COPY server server
+COPY --from=dep-install-stage /app /app
+RUN yarn workspace ott-common run build && yarn workspace ott-client run build && yarn workspace ott-server run build
+RUN rm -rf packages/ott-vis*
 RUN rm -rf node_modules && yarn install --production=true
 
 FROM node:18-alpine3.19 as production-stage
-ARG DEPLOY_TARGET
 
-WORKDIR /usr/app/
+WORKDIR /app
+COPY --from=build-stage /app /app
+RUN rm -rf client/public client/src client/.browserslistrc .eslintrc.js .gitignore client/vite.config.js client/babel.config.js docker-compose.yml /root/.npm tools crates
+
+FROM node:18-alpine3.19 as docker-stage
+# For use in docker-compose
 
+WORKDIR /app
 ENV NODE_ENV production
 ENV FFPROBE_PATH /usr/bin/ffprobe
-
 RUN apk update -q && apk --no-cache add curl ffmpeg -q
+COPY docker/scripts/wait_for_db.sh /app/wait_for_db.sh
+COPY --from=production-stage /app /app
+HEALTHCHECK --interval=30s --timeout=3s CMD ( curl -f http://localhost:8080/api/status || exit 1 )
 
-COPY --from=build-stage /usr/app/ /usr/app/
-
-RUN rm -rf client/public client/src client/.browserslistrc .eslintrc.js .gitignore client/vite.config.js docker-compose.yml /root/.npm deploy crates tools
+CMD ["/bin/sh", "wait_for_db.sh", "--", "yarn", "run", "start"]
 
-COPY deploy/base.toml /usr/app/env/
-COPY deploy/$DEPLOY_TARGET.toml /usr/app/env/production.toml
+FROM node:18-alpine3.19 as deploy-stage
+# For deployment on Fly
+ARG DEPLOY_TARGET
 
-# Healthcheck API, WEB, REDIS
+WORKDIR /app
+ENV NODE_ENV production
+ENV FFPROBE_PATH /usr/bin/ffprobe
+RUN apk update -q && apk --no-cache add curl ffmpeg -q
+COPY --from=production-stage /app /app
+COPY deploy/base.toml /app/env/
+COPY deploy/$DEPLOY_TARGET.toml /app/env/production.toml
 HEALTHCHECK --interval=30s --timeout=3s CMD ( curl -f http://localhost:8080/api/status || exit 1 )
 
-# Start Server
-CMD ["yarn", "workspace", "ott-server", "run", "start-lean"]
+CMD ["yarn", "workspace", "ott-server", "run", "start-lean"]

docker/Dockerfile

@@ -4,7 +4,8 @@ services:
     image: opentogethertube
     build:
       context: ../
-      dockerfile: docker/Dockerfile
+      dockerfile: deploy/monolith.Dockerfile
+      target: docker-stage
       args:
         - GIT_COMMIT=${GIT_COMMIT:-$(git rev-parse HEAD)}
     container_name: opentogethertube
@@ -29,7 +30,7 @@ services:
       - redis_db
       - postgres_db
     volumes:
-      - "../env:/usr/app/env"
+      - "../env:/app/env"
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
 
   redis_db:

docker/docker-compose.yml

@@ -4,7 +4,8 @@ services:
     image: opentogethertube
     build:
       context: ../
-      dockerfile: docker/Dockerfile
+      dockerfile: deploy/monolith.Dockerfile
+      target: docker-stage
       args:
         - GIT_COMMIT=${GIT_COMMIT:-$(git rev-parse HEAD)}
     environment:
@@ -26,7 +27,7 @@ services:
       - redis_db
       - postgres_db
     volumes:
-      - "../env:/usr/app/env"
+      - "../env:/app/env"
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
 
   balancer: