Skip to content

Commit a442a68

Browse files
committed
attempt to reduce layers number in dev.Dockerfile
1 parent e6fc723 commit a442a68

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

.dockerignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
!rust/cube-prop-ctx-transpiler-swc-plugin/Cargo.toml
1919
!rust/import-export-transpiler-swc-plugin/Cargo.toml
2020
!rust/validation-transpiler-swc-plugin/Cargo.toml
21+
!rust/check-dup-prop-transpiler-swc-plugin/target/wasm32-wasip1/release/*.wasm
22+
!rust/cube-prop-ctx-transpiler-swc-plugin/target/wasm32-wasip1/release/*.wasm
23+
!rust/import-export-transpiler-swc-plugin/target/wasm32-wasip1/release/*.wasm
24+
!rust/validation-transpiler-swc-plugin/target/wasm32-wasip1/release/*.wasm
2125

2226
# Ignoring builds for native from local machime to protect a problem with different architecture
2327
packages/cubejs-backend-native/index.node
@@ -29,3 +33,8 @@ packages/*/dist/
2933
packages/*/coverage/
3034
# Other
3135
packages/cubejs-server-core/playground/
36+
# Rust swc caches
37+
rust/check-dup-prop-transpiler-swc-plugin/target
38+
rust/cube-prop-ctx-transpiler-swc-plugin/target
39+
rust/import-export-transpiler-swc-plugin/target
40+
rust/validation-transpiler-swc-plugin/target

.github/workflows/push.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ jobs:
737737
run: yarn build
738738
- name: Lerna tsc
739739
run: yarn tsc
740+
- name: Build transpilers swc plugins
741+
run: yarn lerna run build-swc-plugin
740742
- name: Build cubejs-backend-native (without Python)
741743
run: yarn run native:build-release
742744
working-directory: ./packages/cubejs-backend-native

packages/cubejs-docker/dev.Dockerfile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ ENV NODE_ENV=development
2525

2626
WORKDIR /cubejs
2727

28-
COPY package.json .
29-
COPY lerna.json .
30-
COPY yarn.lock .
31-
COPY tsconfig.base.json .
32-
COPY rollup.config.js .
33-
COPY packages/cubejs-linter packages/cubejs-linter
28+
COPY package.json lerna.json yarn.lock tsconfig.base.json rollup.config.js ./
3429

3530
# Backend
3631
COPY rust/cubesql/package.json rust/cubesql/package.json
@@ -88,14 +83,10 @@ COPY packages/cubejs-client-ngx/package.json packages/cubejs-client-ngx/package.
8883
COPY packages/cubejs-client-ws-transport/package.json packages/cubejs-client-ws-transport/package.json
8984
COPY packages/cubejs-playground/package.json packages/cubejs-playground/package.json
9085

91-
COPY rust/check-dup-prop-transpiler-swc-plugin/package.json rust/check-dup-prop-transpiler-swc-plugin/package.json
92-
COPY rust/cube-prop-ctx-transpiler-swc-plugin/package.json rust/cube-prop-ctx-transpiler-swc-plugin/package.json
93-
COPY rust/import-export-transpiler-swc-plugin/package.json rust/import-export-transpiler-swc-plugin/package.json
94-
COPY rust/validation-transpiler-swc-plugin/package.json rust/validation-transpiler-swc-plugin/package.json
95-
COPY rust/check-dup-prop-transpiler-swc-plugin/Cargo.toml rust/check-dup-prop-transpiler-swc-plugin/Cargo.toml
96-
COPY rust/cube-prop-ctx-transpiler-swc-plugin/Cargo.toml rust/cube-prop-ctx-transpiler-swc-plugin/Cargo.toml
97-
COPY rust/import-export-transpiler-swc-plugin/Cargo.toml rust/import-export-transpiler-swc-plugin/Cargo.toml
98-
COPY rust/validation-transpiler-swc-plugin/Cargo.toml rust/validation-transpiler-swc-plugin/Cargo.toml
86+
COPY rust/check-dup-prop-transpiler-swc-plugin/package.json rust/check-dup-prop-transpiler-swc-plugin/Cargo.toml rust/check-dup-prop-transpiler-swc-plugin/
87+
COPY rust/cube-prop-ctx-transpiler-swc-plugin/package.json rust/cube-prop-ctx-transpiler-swc-plugin/Cargo.toml rust/cube-prop-ctx-transpiler-swc-plugin/
88+
COPY rust/import-export-transpiler-swc-plugin/package.json rust/import-export-transpiler-swc-plugin/Cargo.toml rust/import-export-transpiler-swc-plugin/
89+
COPY rust/validation-transpiler-swc-plugin/package.json rust/validation-transpiler-swc-plugin/Cargo.toml rust/validation-transpiler-swc-plugin/
9990

10091
RUN yarn policies set-version v1.22.22
10192
# Yarn v1 uses aggressive timeouts with summing time spending on fs, https://github.com/yarnpkg/yarn/issues/4890

0 commit comments

Comments
 (0)