@catladder/pipeline 1.99.0 → 1.99.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. package/dist/build/node/buildJob.js +1 -7
  2. package/dist/build/node/yarn.d.ts +2 -5
  3. package/dist/build/node/yarn.js +27 -15
  4. package/dist/bundles/catladder-gitlab/index.js +1 -1
  5. package/dist/constants.js +1 -1
  6. package/dist/pipeline/packageManager.js +4 -4
  7. package/dist/tsconfig.tsbuildinfo +1 -1
  8. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +24 -12
  9. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +24 -12
  10. package/examples/__snapshots__/cloud-run-non-public.ts.snap +24 -12
  11. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +48 -24
  12. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +48 -24
  13. package/examples/__snapshots__/custom-deploy.ts.snap +24 -12
  14. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +24 -12
  15. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +24 -12
  16. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +24 -12
  17. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +48 -24
  18. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +24 -12
  19. package/package.json +1 -1
  20. package/src/build/node/buildJob.ts +3 -8
  21. package/src/build/node/yarn.ts +38 -25
  22. package/src/pipeline/packageManager.ts +7 -6
package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap CHANGED
@@ -261,8 +261,13 @@ cloudsql:
261
261
  "DOCKERFILE_ADDITIONS_END": undefined,
262
262
  "DOCKER_BUILDKIT": "1",
263
263
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
264
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
265
+ RUN yarn plugin import workspace-tools
266
+ RUN yarn workspaces focus --production && yarn rebuild",
264
267
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
265
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
268
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
269
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
270
+ COPY --chown=node:node .yarn /app/.yarn",
266
271
  "DOCKER_DIR": ".",
267
272
  "DOCKER_DRIVER": "overlay2",
268
273
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -276,8 +281,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
276
281
  "KUBERNETES_CPU_REQUEST": "0.5",
277
282
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
278
283
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
279
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
280
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
281
284
  },
282
285
  },
283
286
  "api 🚀 Deploy | dev ": {
@@ -948,8 +951,13 @@ cloudsql:
948
951
  "DOCKERFILE_ADDITIONS_END": undefined,
949
952
  "DOCKER_BUILDKIT": "1",
950
953
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
954
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
955
+ RUN yarn plugin import workspace-tools
956
+ RUN yarn workspaces focus --production && yarn rebuild",
951
957
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
952
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
958
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
959
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
960
+ COPY --chown=node:node .yarn /app/.yarn",
953
961
  "DOCKER_DIR": ".",
954
962
  "DOCKER_DRIVER": "overlay2",
955
963
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -963,8 +971,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
963
971
  "KUBERNETES_CPU_REQUEST": "0.5",
964
972
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
965
973
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
966
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
967
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
968
974
  },
969
975
  },
970
976
  "api 🚀 Deploy | review ": {
@@ -1760,8 +1766,13 @@ cloudsql:
1760
1766
  "DOCKERFILE_ADDITIONS_END": undefined,
1761
1767
  "DOCKER_BUILDKIT": "1",
1762
1768
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1769
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1770
+ RUN yarn plugin import workspace-tools
1771
+ RUN yarn workspaces focus --production && yarn rebuild",
1763
1772
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1764
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1773
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1774
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1775
+ COPY --chown=node:node .yarn /app/.yarn",
1765
1776
  "DOCKER_DIR": ".",
1766
1777
  "DOCKER_DRIVER": "overlay2",
1767
1778
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1775,8 +1786,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1775
1786
  "KUBERNETES_CPU_REQUEST": "0.5",
1776
1787
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1777
1788
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1778
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1779
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1780
1789
  },
1781
1790
  },
1782
1791
  "api 🔨 docker | stage ": {
@@ -1826,8 +1835,13 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1826
1835
  "DOCKERFILE_ADDITIONS_END": undefined,
1827
1836
  "DOCKER_BUILDKIT": "1",
1828
1837
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1838
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1839
+ RUN yarn plugin import workspace-tools
1840
+ RUN yarn workspaces focus --production && yarn rebuild",
1829
1841
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1830
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1842
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1843
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1844
+ COPY --chown=node:node .yarn /app/.yarn",
1831
1845
  "DOCKER_DIR": ".",
1832
1846
  "DOCKER_DRIVER": "overlay2",
1833
1847
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1841,8 +1855,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1841
1855
  "KUBERNETES_CPU_REQUEST": "0.5",
1842
1856
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1843
1857
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1844
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1845
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1846
1858
  },
1847
1859
  },
1848
1860
  "api 🚀 Deploy | prod ": {
package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap CHANGED
@@ -262,8 +262,13 @@ cloudsql:
262
262
  "DOCKERFILE_ADDITIONS_END": undefined,
263
263
  "DOCKER_BUILDKIT": "1",
264
264
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
265
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
266
+ RUN yarn plugin import workspace-tools
267
+ RUN yarn workspaces focus --production && yarn rebuild",
265
268
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
266
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
269
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
270
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
271
+ COPY --chown=node:node .yarn /app/.yarn",
267
272
  "DOCKER_DIR": ".",
268
273
  "DOCKER_DRIVER": "overlay2",
269
274
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -277,8 +282,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
277
282
  "KUBERNETES_CPU_REQUEST": "0.5",
278
283
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
279
284
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
280
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
281
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
282
285
  },
283
286
  },
284
287
  "api 🚀 Deploy | dev ": {
@@ -952,8 +955,13 @@ cloudsql:
952
955
  "DOCKERFILE_ADDITIONS_END": undefined,
953
956
  "DOCKER_BUILDKIT": "1",
954
957
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
958
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
959
+ RUN yarn plugin import workspace-tools
960
+ RUN yarn workspaces focus --production && yarn rebuild",
955
961
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
956
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
962
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
963
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
964
+ COPY --chown=node:node .yarn /app/.yarn",
957
965
  "DOCKER_DIR": ".",
958
966
  "DOCKER_DRIVER": "overlay2",
959
967
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -967,8 +975,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
967
975
  "KUBERNETES_CPU_REQUEST": "0.5",
968
976
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
969
977
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
970
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
971
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
972
978
  },
973
979
  },
974
980
  "api 🚀 Deploy | review ": {
@@ -1768,8 +1774,13 @@ cloudsql:
1768
1774
  "DOCKERFILE_ADDITIONS_END": undefined,
1769
1775
  "DOCKER_BUILDKIT": "1",
1770
1776
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1777
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1778
+ RUN yarn plugin import workspace-tools
1779
+ RUN yarn workspaces focus --production && yarn rebuild",
1771
1780
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1772
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1781
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1782
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1783
+ COPY --chown=node:node .yarn /app/.yarn",
1773
1784
  "DOCKER_DIR": ".",
1774
1785
  "DOCKER_DRIVER": "overlay2",
1775
1786
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1783,8 +1794,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1783
1794
  "KUBERNETES_CPU_REQUEST": "0.5",
1784
1795
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1785
1796
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1786
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1787
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1788
1797
  },
1789
1798
  },
1790
1799
  "api 🔨 docker | stage ": {
@@ -1834,8 +1843,13 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1834
1843
  "DOCKERFILE_ADDITIONS_END": undefined,
1835
1844
  "DOCKER_BUILDKIT": "1",
1836
1845
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1846
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1847
+ RUN yarn plugin import workspace-tools
1848
+ RUN yarn workspaces focus --production && yarn rebuild",
1837
1849
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1838
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1850
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1851
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1852
+ COPY --chown=node:node .yarn /app/.yarn",
1839
1853
  "DOCKER_DIR": ".",
1840
1854
  "DOCKER_DRIVER": "overlay2",
1841
1855
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1849,8 +1863,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1849
1863
  "KUBERNETES_CPU_REQUEST": "0.5",
1850
1864
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1851
1865
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1852
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1853
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1854
1866
  },
1855
1867
  },
1856
1868
  "api 🚀 Deploy | prod ": {
package/examples/__snapshots__/kubernetes-with-jobs.ts.snap CHANGED
@@ -256,8 +256,13 @@ cronjobs:
256
256
  "DOCKERFILE_ADDITIONS_END": undefined,
257
257
  "DOCKER_BUILDKIT": "1",
258
258
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
259
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
260
+ RUN yarn plugin import workspace-tools
261
+ RUN yarn workspaces focus --production && yarn rebuild",
259
262
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
260
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
263
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
264
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
265
+ COPY --chown=node:node .yarn /app/.yarn",
261
266
  "DOCKER_DIR": ".",
262
267
  "DOCKER_DRIVER": "overlay2",
263
268
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -271,8 +276,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
271
276
  "KUBERNETES_CPU_REQUEST": "0.5",
272
277
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
273
278
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
274
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
275
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
276
279
  },
277
280
  },
278
281
  "api 🚀 Deploy | dev ": {
@@ -853,8 +856,13 @@ application:
853
856
  "DOCKERFILE_ADDITIONS_END": undefined,
854
857
  "DOCKER_BUILDKIT": "1",
855
858
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
859
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
860
+ RUN yarn plugin import workspace-tools
861
+ RUN yarn workspaces focus --production && yarn rebuild",
856
862
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node www/package.json /app/www/package.json
857
- COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
863
+ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
864
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
865
+ COPY --chown=node:node .yarn /app/.yarn",
858
866
  "DOCKER_DIR": ".",
859
867
  "DOCKER_DRIVER": "overlay2",
860
868
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -868,8 +876,6 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
868
876
  "KUBERNETES_CPU_REQUEST": "0.5",
869
877
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
870
878
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
871
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
872
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
873
879
  },
874
880
  },
875
881
  "www 🚀 Deploy | dev ": {
@@ -1512,8 +1518,13 @@ cronjobs: {}
1512
1518
  "DOCKERFILE_ADDITIONS_END": undefined,
1513
1519
  "DOCKER_BUILDKIT": "1",
1514
1520
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1521
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1522
+ RUN yarn plugin import workspace-tools
1523
+ RUN yarn workspaces focus --production && yarn rebuild",
1515
1524
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1516
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1525
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1526
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1527
+ COPY --chown=node:node .yarn /app/.yarn",
1517
1528
  "DOCKER_DIR": ".",
1518
1529
  "DOCKER_DRIVER": "overlay2",
1519
1530
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1527,8 +1538,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1527
1538
  "KUBERNETES_CPU_REQUEST": "0.5",
1528
1539
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1529
1540
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1530
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1531
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1532
1541
  },
1533
1542
  },
1534
1543
  "api 🚀 Deploy | review ": {
@@ -2103,8 +2112,13 @@ application:
2103
2112
  "DOCKERFILE_ADDITIONS_END": undefined,
2104
2113
  "DOCKER_BUILDKIT": "1",
2105
2114
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
2115
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2116
+ RUN yarn plugin import workspace-tools
2117
+ RUN yarn workspaces focus --production && yarn rebuild",
2106
2118
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node www/package.json /app/www/package.json
2107
- COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
2119
+ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
2120
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
2121
+ COPY --chown=node:node .yarn /app/.yarn",
2108
2122
  "DOCKER_DIR": ".",
2109
2123
  "DOCKER_DRIVER": "overlay2",
2110
2124
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -2118,8 +2132,6 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
2118
2132
  "KUBERNETES_CPU_REQUEST": "0.5",
2119
2133
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
2120
2134
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
2121
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
2122
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
2123
2135
  },
2124
2136
  },
2125
2137
  "www 🚀 Deploy | review ": {
@@ -2885,8 +2897,13 @@ cronjobs:
2885
2897
  "DOCKERFILE_ADDITIONS_END": undefined,
2886
2898
  "DOCKER_BUILDKIT": "1",
2887
2899
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2900
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2901
+ RUN yarn plugin import workspace-tools
2902
+ RUN yarn workspaces focus --production && yarn rebuild",
2888
2903
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
2889
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
2904
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
2905
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
2906
+ COPY --chown=node:node .yarn /app/.yarn",
2890
2907
  "DOCKER_DIR": ".",
2891
2908
  "DOCKER_DRIVER": "overlay2",
2892
2909
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -2900,8 +2917,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
2900
2917
  "KUBERNETES_CPU_REQUEST": "0.5",
2901
2918
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
2902
2919
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
2903
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
2904
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
2905
2920
  },
2906
2921
  },
2907
2922
  "api 🔨 docker | stage ": {
@@ -2951,8 +2966,13 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
2951
2966
  "DOCKERFILE_ADDITIONS_END": undefined,
2952
2967
  "DOCKER_BUILDKIT": "1",
2953
2968
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
2969
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
2970
+ RUN yarn plugin import workspace-tools
2971
+ RUN yarn workspaces focus --production && yarn rebuild",
2954
2972
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
2955
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
2973
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
2974
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
2975
+ COPY --chown=node:node .yarn /app/.yarn",
2956
2976
  "DOCKER_DIR": ".",
2957
2977
  "DOCKER_DRIVER": "overlay2",
2958
2978
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -2966,8 +2986,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
2966
2986
  "KUBERNETES_CPU_REQUEST": "0.5",
2967
2987
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
2968
2988
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
2969
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
2970
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
2971
2989
  },
2972
2990
  },
2973
2991
  "api 🚀 Deploy | prod ": {
@@ -3833,8 +3851,13 @@ application:
3833
3851
  "DOCKERFILE_ADDITIONS_END": undefined,
3834
3852
  "DOCKER_BUILDKIT": "1",
3835
3853
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
3854
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3855
+ RUN yarn plugin import workspace-tools
3856
+ RUN yarn workspaces focus --production && yarn rebuild",
3836
3857
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node www/package.json /app/www/package.json
3837
- COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
3858
+ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
3859
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
3860
+ COPY --chown=node:node .yarn /app/.yarn",
3838
3861
  "DOCKER_DIR": ".",
3839
3862
  "DOCKER_DRIVER": "overlay2",
3840
3863
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -3848,8 +3871,6 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
3848
3871
  "KUBERNETES_CPU_REQUEST": "0.5",
3849
3872
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
3850
3873
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
3851
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
3852
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
3853
3874
  },
3854
3875
  },
3855
3876
  "www 🔨 docker | stage ": {
@@ -3899,8 +3920,13 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
3899
3920
  "DOCKERFILE_ADDITIONS_END": undefined,
3900
3921
  "DOCKER_BUILDKIT": "1",
3901
3922
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/www",
3923
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
3924
+ RUN yarn plugin import workspace-tools
3925
+ RUN yarn workspaces focus --production && yarn rebuild",
3902
3926
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node www/package.json /app/www/package.json
3903
- COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
3927
+ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
3928
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
3929
+ COPY --chown=node:node .yarn /app/.yarn",
3904
3930
  "DOCKER_DIR": ".",
3905
3931
  "DOCKER_DRIVER": "overlay2",
3906
3932
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -3914,8 +3940,6 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
3914
3940
  "KUBERNETES_CPU_REQUEST": "0.5",
3915
3941
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
3916
3942
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
3917
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
3918
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
3919
3943
  },
3920
3944
  },
3921
3945
  "www 🚀 Deploy | prod ": {
package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap CHANGED
@@ -278,8 +278,13 @@ mongodb:
278
278
  "DOCKERFILE_ADDITIONS_END": undefined,
279
279
  "DOCKER_BUILDKIT": "1",
280
280
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
281
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
282
+ RUN yarn plugin import workspace-tools
283
+ RUN yarn workspaces focus --production && yarn rebuild",
281
284
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
282
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
285
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
286
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
287
+ COPY --chown=node:node .yarn /app/.yarn",
283
288
  "DOCKER_DIR": ".",
284
289
  "DOCKER_DRIVER": "overlay2",
285
290
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -293,8 +298,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
293
298
  "KUBERNETES_CPU_REQUEST": "0.5",
294
299
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
295
300
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
296
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
297
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
298
301
  },
299
302
  },
300
303
  "api 🚀 Deploy | dev ": {
@@ -1016,8 +1019,13 @@ mongodb:
1016
1019
  "DOCKERFILE_ADDITIONS_END": undefined,
1017
1020
  "DOCKER_BUILDKIT": "1",
1018
1021
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1022
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1023
+ RUN yarn plugin import workspace-tools
1024
+ RUN yarn workspaces focus --production && yarn rebuild",
1019
1025
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1020
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1026
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1027
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1028
+ COPY --chown=node:node .yarn /app/.yarn",
1021
1029
  "DOCKER_DIR": ".",
1022
1030
  "DOCKER_DRIVER": "overlay2",
1023
1031
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1031,8 +1039,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1031
1039
  "KUBERNETES_CPU_REQUEST": "0.5",
1032
1040
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1033
1041
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1034
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1035
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1036
1042
  },
1037
1043
  },
1038
1044
  "api 🚀 Deploy | review ": {
@@ -1896,8 +1902,13 @@ mongodb:
1896
1902
  "DOCKERFILE_ADDITIONS_END": undefined,
1897
1903
  "DOCKER_BUILDKIT": "1",
1898
1904
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1905
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1906
+ RUN yarn plugin import workspace-tools
1907
+ RUN yarn workspaces focus --production && yarn rebuild",
1899
1908
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1900
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1909
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1910
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1911
+ COPY --chown=node:node .yarn /app/.yarn",
1901
1912
  "DOCKER_DIR": ".",
1902
1913
  "DOCKER_DRIVER": "overlay2",
1903
1914
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1911,8 +1922,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1911
1922
  "KUBERNETES_CPU_REQUEST": "0.5",
1912
1923
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1913
1924
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1914
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1915
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1916
1925
  },
1917
1926
  },
1918
1927
  "api 🔨 docker | stage ": {
@@ -1962,8 +1971,13 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1962
1971
  "DOCKERFILE_ADDITIONS_END": undefined,
1963
1972
  "DOCKER_BUILDKIT": "1",
1964
1973
  "DOCKER_CACHE_IMAGE": "$DOCKER_REGISTRY_IMAGE_PATH/caches/api",
1974
+ "DOCKER_COPY_AND_INSTALL_APP": "COPY --chown=node:node $APP_DIR .
1975
+ RUN yarn plugin import workspace-tools
1976
+ RUN yarn workspaces focus --production && yarn rebuild",
1965
1977
  "DOCKER_COPY_WORKSPACE_FILES": "COPY --chown=node:node api/package.json /app/api/package.json
1966
- COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1978
+ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
1979
+ COPY --chown=node:node .yarnrc.yml /app/.yarnrc.yml
1980
+ COPY --chown=node:node .yarn /app/.yarn",
1967
1981
  "DOCKER_DIR": ".",
1968
1982
  "DOCKER_DRIVER": "overlay2",
1969
1983
  "DOCKER_HOST": "tcp://0.0.0.0:2375",
@@ -1977,8 +1991,6 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
1977
1991
  "KUBERNETES_CPU_REQUEST": "0.5",
1978
1992
  "KUBERNETES_MEMORY_LIMIT": "2Gi",
1979
1993
  "KUBERNETES_MEMORY_REQUEST": "1Gi",
1980
- "YARN_INSTALL": "yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1981
- "YARN_INSTALL_WITHOUT_SCRIPTS": "YARN_ENABLE_SCRIPTS=false yarn plugin import workspace-tools && yarn workspaces focus --production && yarn rebuild",
1982
1994
  },
1983
1995
  },
1984
1996
  "api 🚀 Deploy | prod ": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@catladder/pipeline",
3
- "version": "1.99.0",
3
+ "version": "1.99.2",
4
4
  "scripts": {
5
5
  "build:tsc": "yarn tsc",
6
6
  "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
package/src/build/node/buildJob.ts CHANGED
@@ -7,7 +7,7 @@ import { join } from "path";
7
7
  import { isOfBuildType } from "../types";
8
8
  import { getNextCache, getNodeCache, getYarnCache } from "./cache";
9
9
  import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
10
- import { getYarnInstall, getYarnInstallCommand } from "./yarn";
10
+ import { getDockerAppCopyAndBuildScript, getYarnInstall } from "./yarn";
11
11
  import type { CatladderJob } from "../../types/jobs";
12
12
 
13
13
  export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
@@ -55,13 +55,8 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
55
55
  cache: [...getYarnCache(context, "pull")],
56
56
  variables: {
57
57
  // only required for non static
58
- YARN_INSTALL: getYarnInstallCommand(context, {
59
- prodOnly: true,
60
- }),
61
- YARN_INSTALL_WITHOUT_SCRIPTS: getYarnInstallCommand(context, {
62
- prodOnly: true,
63
- noScripts: true,
64
- }),
58
+ DOCKER_COPY_AND_INSTALL_APP:
59
+ getDockerAppCopyAndBuildScript(context),
65
60
  DOCKER_COPY_WORKSPACE_FILES:
66
61
  context.packageManagerInfo?.pathsToCopyInDocker
67
62
  .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
package/src/build/node/yarn.ts CHANGED
@@ -1,33 +1,16 @@
1
1
  import type { Context } from "../../types";
2
2
 
3
- export const getYarnInstallCommand = (
4
- context: Context,
5
- options?: {
6
- prodOnly?: boolean;
7
- noScripts?: boolean;
8
- }
9
- ) => {
3
+ const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
4
+
5
+ // FIXME: check why and when rebuild is needed
6
+ const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
7
+
8
+ const getYarnInstallCommand = (context: Context) => {
10
9
  if (context.packageManagerInfo?.isClassic) {
11
- return `yarn install --frozen-lockfile ${
12
- options?.prodOnly ? "--production" : ""
13
- } ${options?.noScripts ? "--ignore-scripts" : ""}`;
10
+ return YARN_INSTALL_CLASSIC;
14
11
  }
15
- // is modern
16
12
 
17
- // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
18
- // trying to import those fail on this version
19
- const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) =>
20
- context.packageManagerInfo?.version.startsWith(v)
21
- );
22
- return options?.prodOnly
23
- ? `${options?.noScripts ? "YARN_ENABLE_SCRIPTS=false " : ""}${
24
- doesNotShipWithBuiltInPlugins
25
- ? "yarn plugin import workspace-tools && "
26
- : " "
27
- }yarn workspaces focus --production && yarn rebuild` // needs yarn plugin import workspace-tools
28
- : `${
29
- options?.noScripts ? "YARN_ENABLE_SCRIPTS=false " : ""
30
- }yarn install --immutable`;
13
+ return `yarn install --immutable`;
31
14
  };
32
15
 
33
16
  export const ensureNodeVersion = (context: Context) => [
@@ -38,3 +21,33 @@ export const getYarnInstall = (context: Context) => [
38
21
  ...ensureNodeVersion(context),
39
22
  getYarnInstallCommand(context),
40
23
  ];
24
+
25
+ const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
26
+
27
+ export const getDockerAppCopyAndBuildScript = (context: Context) => {
28
+ if (context.packageManagerInfo?.isClassic) {
29
+ return `
30
+ RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
31
+ ${DOCKER_COPY_FILES}
32
+ RUN ${YARN_INSTALL_CLASSIC} --production
33
+ `.trim();
34
+ }
35
+
36
+ // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
37
+ // trying to import those fail on this version
38
+ const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) =>
39
+ context.packageManagerInfo?.version.startsWith(v)
40
+ );
41
+ const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
42
+ ? "RUN yarn plugin import workspace-tools"
43
+ : "";
44
+
45
+ // copy first everything and then install
46
+ // rebuild first does not work as it will run postinstall and that might require files in the app
47
+ return `
48
+ ${DOCKER_COPY_FILES}
49
+ ${maybeAddWorkspaceToolsCommand}
50
+ RUN ${YARN_BERRY_PROD_REBUILD}
51
+
52
+ `.trim();
53
+ };
package/src/pipeline/packageManager.ts CHANGED
@@ -29,11 +29,12 @@ export const getPackageManagerInfo = async (
29
29
  ? join(workspaceRoot, "yarn.lock")
30
30
  : join(component.dir, "yarn.lock");
31
31
  const configFiles = [".yarnrc", ".yarnrc.yml", ".npmrc", ".yarn"]; // ".yarn" is yarn 2 folder
32
- const rcFiles = (
33
- componentIsInWorkspace
34
- ? configFiles
35
- : configFiles.map((f) => join(component.dir, f))
36
- ).filter((f) => existsSync(f));
32
+ // copy all those configFiles from workspace root and/or component folder
33
+
34
+ const configFilePaths = [
35
+ ...configFiles,
36
+ ...configFiles.map((f) => join(component.dir, f)),
37
+ ].filter((f) => existsSync(f));
37
38
 
38
39
  // get all folders that this workspace depend on
39
40
  // we will later copy them into the docker build
@@ -50,7 +51,7 @@ export const getPackageManagerInfo = async (
50
51
  packageJson,
51
52
  ...(workspacePackageJson ? [workspacePackageJson] : []),
52
53
  lockFile,
53
- ...rcFiles,
54
+ ...configFilePaths,
54
55
  ...workspaceDependencies,
55
56
  ];
56
57
  return {