Merge pull request #2939 from w3f/yuri/dockerfile-rework

Dockerfile rework

Author: ironoa

.circleci/config.yml

@@ -171,44 +171,12 @@ jobs:
     resource_class: xlarge
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          docker_layer_caching: true
       - run:
           command: |
             /scripts/build-image.sh web3f/otv-backend . --build-arg PACKAGE=core
 
-  buildGatewayImage:
-    docker:
-      - image: web3f/ci-commons:v3.2.3
-    resource_class: xlarge
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          command: |
-            /scripts/build-image.sh web3f/otv-gateway . --build-arg PACKAGE=gateway
-
-  buildTelemetryImage:
-    docker:
-      - image: web3f/ci-commons:v3.2.3
-    resource_class: xlarge
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          command: |
-            /scripts/build-image.sh web3f/otv-telemetry . --build-arg PACKAGE=telemetry
-
-  buildWorkerImage:
-    docker:
-      - image: web3f/ci-commons:v3.2.3
-    resource_class: xlarge
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          command: |
-            /scripts/build-image.sh web3f/otv-worker . --build-arg PACKAGE=worker
-
   integrationTests:
     docker:
       - image: web3f/ci-commons:v3.2.3
@@ -344,21 +312,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - buildGatewayImage:
-          context: dockerhub-bot
-          filters:
-            tags:
-              only: /.*/
-      - buildTelemetryImage:
-          context: dockerhub-bot
-          filters:
-            tags:
-              only: /.*/
-      - buildWorkerImage:
-          context: dockerhub-bot
-          filters:
-            tags:
-              only: /.*/
       - integrationTests:
           filters:
             tags:

.dockerignore

@@ -1,22 +1,13 @@
-alice
-bob
-.dockerignore
-node_modules
-scripts
-test
-zero
-*.db
-charts
-helmfile.d
-build
-.circleci
-.editorconfig
-.git
-.github
-.gitignore
-.idea
-combined.log
-docker-compose.yml
-node_modules/
-
-*/**/node_modules/
+*
+!docs
+!packages
+!package.json
+!tsconfig.json
+!turbo.json
+!.yarnrc.yml
+!yarn.lock
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions

Dockerfile

@@ -3,12 +3,15 @@ ARG MATRIX_TOKEN
 ARG PACKAGE
 ENV PACKAGE ${PACKAGE}
 WORKDIR /code
+
+COPY docs docs
+RUN cd docs && npm install && npm run build
+
 COPY . .
-RUN echo "building ${PACKAGE}... "; \
-    yarn install; \
-    echo "yarn install done. Building...." ; \
-    yarn build; \
-    echo "building ${PACKAGE} done."; \
-    apt-get update && \
-    apt-get clean
-CMD yarn run start:js:${PACKAGE}
+
+RUN --mount=type=cache,target=/code/.yarn/cache \
+    --mount=type=cache,target=/turbo_cache \
+    yarn install --immutable && \
+    yarn turbo --cache-dir /turbo_cache
+
+CMD yarn run start:js:${PACKAGE}

Dockerfile-dev

@@ -5,12 +5,12 @@ ARG PACKAGE
 ENV PACKAGE ${PACKAGE}
 COPY . /code
 WORKDIR /code
-RUN echo "building ${PACKAGE}... "; \
-    yarn install; \
-    echo "yarn install done. Building...." ; \
-    yarn build; \
-    echo "building ${PACKAGE} done."; \
+RUN echo "building ${PACKAGE}... " && \
+    yarn install && \
+    echo "yarn install done. Building...." && \
+    yarn build && \
+    echo "building ${PACKAGE} done." && \
     apt-get update && \
     apt-get install -y libssl-dev && \
     apt-get clean
-CMD yarn run start:dev:${PACKAGE}
+CMD yarn run start:dev:${PACKAGE}

packages/common/.dockerignore

@@ -1,11 +1,5 @@
-alice
-bob
-node_modules
-scripts
-test
-zero
-*.db
-charts
-helmfile.d
-build
-dist/*
+*
+!package.json
+!tsconfig.json
+!src
+!data

packages/core/.dockerignore

@@ -1,10 +1,5 @@
-alice
-bob
-node_modules
-scripts
-test
-zero
-*.db
-charts
-helmfile.d
-build
+*
+!package.json
+!tsconfig.json
+!src
+!config

packages/telemetry/.dockerignore

@@ -1,10 +1,5 @@
-alice
-bob
-node_modules
-scripts
-test
-zero
-*.db
-charts
-helmfile.d
-build
+*
+!package.json
+!tsconfig.json
+!src
+!config

packages/worker/.dockerignore

@@ -1,10 +1,5 @@
-alice
-bob
-node_modules
-scripts
-test
-zero
-*.db
-charts
-helmfile.d
-build
+*
+!package.json
+!tsconfig.json
+!src
+!config

turbo.json

@@ -2,10 +2,7 @@
   "$schema": "https://turbo.build/schema.json",
   "pipeline": {
     "build": {
-      "outputs": [".next/**", "!.next/cache/**"]
-    },
-    "deploy": {
-      "dependsOn": ["build", "test", "lint"]
+      "outputs": ["build/**", "dist/**"]
     },
     "test": {
       "inputs": ["src/**/*.tsx", "src/**/*.ts", "test/**/*.ts", "test/**/*.tsx"]