Merge pull request #9648 from nocodb/chore/buildx-opt

chore: Optimize timely docker build time

.github/workflows/release-timely-docker.yml

@@ -63,9 +63,9 @@ jobs:
               DOCKER_BUILD_TAG=${{ github.event.inputs.currentVersion || inputs.currentVersion }}-${{ github.event.inputs.tag || inputs.tag }}
             fi
             if [[ ${{ inputs.isDaily || 'N' }} == 'Y' ]]; then
-              DOCKER_REPOSITORY=${DOCKER_REPOSITORY}-daily
+              DOCKER_REPOSITORY=nocodb-daily
             else
-              DOCKER_REPOSITORY=${DOCKER_REPOSITORY}-timely
+              DOCKER_REPOSITORY=nocodb-timely
             fi
           fi
           echo "DOCKER_REPOSITORY=${DOCKER_REPOSITORY}" >> $GITHUB_OUTPUT
@@ -78,7 +78,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          fetch-depth: 1
           ref: ${{ github.ref }}
 
       - name: Use Node.js ${{ matrix.node-version }}
@@ -144,7 +144,7 @@ jobs:
           context: ${{ env.working-directory }}
           file: ${{ env.working-directory }}/Dockerfile.timely
           build-args: NC_VERSION=${{ steps.get-docker-repository.outputs.DOCKER_BUILD_TAG }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           push: true

packages/nocodb/Dockerfile.timely

@@ -1,29 +1,32 @@
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.5
+# Use Buildx cross-compilation
 
 ###########
 # Litestream Builder
 ###########
-FROM golang:alpine3.19 as lt-builder
+FROM --platform=$BUILDPLATFORM golang:alpine3.19 as lt-builder
 
 WORKDIR /usr/src/
 
-RUN apk add --no-cache git make musl-dev gcc
+# Use build platform-specific tools
+RUN apk --no-cache add git make musl-dev gcc
 
-# build litestream
+# Build litestream for the target platform
-RUN git clone https://github.com/benbjohnson/litestream.git litestream
+RUN git clone https://github.com/benbjohnson/litestream.git litestream \
-RUN cd litestream && go install ./cmd/litestream
+    && cd litestream \
-RUN cp $GOPATH/bin/litestream /usr/src/lt
+    && GOARCH=$(echo $TARGETPLATFORM | cut -d '/' -f 2) GOOS=$(echo $TARGETPLATFORM | cut -d '/' -f 1) go install ./cmd/litestream \
+    && cp $GOPATH/bin/litestream /usr/src/lt
 
 ###########
 # Builder
 ###########
-FROM node:18.19.1-alpine as builder
+FROM --platform=$BUILDPLATFORM node:18.19.1-alpine as builder
 WORKDIR /usr/src/app
 
-# install node-gyp dependencies
+# Install node-gyp dependencies
 RUN apk add --no-cache python3 make g++
 
-# install pnpm
+# Install pnpm
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
 # Copy application dependency manifests to the container image.
@@ -33,22 +36,37 @@ COPY --link ./docker/start-litestream.sh /usr/src/appEntry/start.sh
 COPY --link src/public/ ./docker/public/
 COPY --link ./docker/nc-gui/ ./docker/nc-gui/
 
-# for pnpm to generate a flat node_modules without symlinks
+# For pnpm to generate a flat node_modules without symlinks
-# so that modclean could work as expected
+# So that modclean works as expected
 RUN echo "node-linker=hoisted" > .npmrc
 
-# install production dependencies,
+# Install production dependencies, reduce node_module size with modclean
-# reduce node_module size with modclean & removing sqlite deps,
+# Removing sqlite deps and add execute permission to start.sh
-# and add execute permission to start.sh
 RUN pnpm install --prod --shamefully-hoist \
     && pnpm dlx modclean --patterns="default:*" --ignore="nc-lib-gui/**,dayjs/**,express-status-monitor/**,@azure/msal-node/dist/**" --run  \
     && rm -rf ./node_modules/sqlite3/deps \
     && chmod +x /usr/src/appEntry/start.sh
 
-##########
+############
+## Binary Dependencies Builder
+############
+FROM --platform=$TARGETPLATFORM node:18.19.1-alpine as bin-builder
+WORKDIR /usr/src/app
+
+RUN apk add --no-cache jq
+
+# copy package.json to extract dependency versions
+COPY --link ./package.json ./package-copy.json
+
+# Install sqlite3 for the target platform to copy to the final image
+RUN SQLITE3_VERSION=$(jq -r '.dependencies["sqlite3"]' /usr/src/app/package-copy.json) \
+    && SHARP_VERSION=$(jq -r '.dependencies["sharp"]' /usr/src/app/package-copy.json) \
+    && npm init -y && npm install sqlite3@$SQLITE3_VERSION sharp@$SHARP_VERSION
+
+###########
 # Runner
-##########
+###########
-FROM alpine:3.19
+FROM --platform=$TARGETPLATFORM alpine:3.19
 WORKDIR /usr/src/app
 
 ENV LITESTREAM_S3_SKIP_VERIFY=false \
@@ -61,16 +79,16 @@ ENV LITESTREAM_S3_SKIP_VERIFY=false \
     NODE_ENV=production \
     PORT=8080
 
-RUN apk add --update --no-cache \
+RUN apk add --update --no-cache dasel dumb-init nodejs
-    dasel \
-    dumb-init \
-    nodejs
 
 # Copy litestream binary and config file
 COPY --link --from=lt-builder /usr/src/lt /usr/local/bin/litestream
 COPY --link ./docker/litestream.yml /etc/litestream.yml
+
 # Copy production code & main entry file
 COPY --link --from=builder /usr/src/app/ /usr/src/app/
+COPY --link --from=bin-builder /usr/src/app/node_modules/sqlite3/ /usr/src/app/node_modules/sqlite3/
+COPY --link --from=bin-builder /usr/src/app/node_modules/sharp/ /usr/src/app/node_modules/sharp/
 COPY --link --from=builder /usr/src/appEntry/ /usr/src/appEntry/
 
 EXPOSE 8080

packages/nocodb/package.json

@@ -197,4 +197,4 @@
     "typescript": "^5.3.3",
     "webpack-cli": "^5.1.4"
   }
-}
+}