فهرست منبع

Remove symlinks at deps-resolver

Taichi Masuyama 3 سال پیش
والد
کامیت
223f51b506
1فایلهای تغییر یافته به همراه8 افزوده شده و 7 حذف شده
  1. 8 7
      packages/app/docker/Dockerfile

+ 8 - 7
packages/app/docker/Dockerfile

@@ -26,6 +26,10 @@ ENV optDir /opt
 
 
 WORKDIR ${optDir}
 WORKDIR ${optDir}
 
 
+ENV nodeModulesGrowiPackagesDir ${optDir}/node_modules/@growi
+# expect a string seperated by commas (e.g. "A,B")
+ENV removeNodeModulesSymlinkPaths ${nodeModulesGrowiPackagesDir}/slackbot-proxy
+
 # copy files
 # copy files
 COPY --from=packages-json-picker ${optDir} .
 COPY --from=packages-json-picker ${optDir} .
 
 
@@ -33,6 +37,9 @@ COPY --from=packages-json-picker ${optDir} .
 RUN yarn config set network-timeout 300000
 RUN yarn config set network-timeout 300000
 RUN npx -y lerna bootstrap -- --frozen-lockfile
 RUN npx -y lerna bootstrap -- --frozen-lockfile
 
 
+# remove unnecessary symlinks
+RUN rm -f $(echo ${removeNodeModulesSymlinkPaths} | sed -e "s/,/ /g")
+
 # make artifacts
 # make artifacts
 RUN tar -cf node_modules.tar \
 RUN tar -cf node_modules.tar \
   node_modules \
   node_modules \
@@ -55,16 +62,12 @@ RUN tar -cf node_modules.tar \
   packages/*/node_modules
   packages/*/node_modules
 
 
 
 
-
 ##
 ##
 ## prebuilder-default
 ## prebuilder-default
 ##
 ##
 FROM node:16-slim AS prebuilder-default
 FROM node:16-slim AS prebuilder-default
 
 
 ENV optDir /opt
 ENV optDir /opt
-ENV nodeModulesGrowiPackagesDir ${optDir}/node_modules/@growi
-# expect a string seperated by commas (e.g. "A,B")
-ENV removeNodeModulesSymlinkPaths ${nodeModulesGrowiPackagesDir}/slackbot-proxy
 
 
 WORKDIR ${optDir}
 WORKDIR ${optDir}
 
 
@@ -76,9 +79,6 @@ COPY --from=deps-resolver \
 RUN tar -xf node_modules.tar
 RUN tar -xf node_modules.tar
 RUN rm node_modules.tar
 RUN rm node_modules.tar
 
 
-# remove symlinks
-RUN rm -f $(echo ${removeNodeModulesSymlinkPaths} | sed -e "s/,/ /g")
-
 
 
 ##
 ##
 ## prebuilder-nocdn
 ## prebuilder-nocdn
@@ -99,6 +99,7 @@ ENV optDir /opt
 
 
 WORKDIR ${optDir}
 WORKDIR ${optDir}
 
 
+# ignore eslint and stylelint
 COPY ["package.json", "lerna.json", "tsconfig.base.json", "./"]
 COPY ["package.json", "lerna.json", "tsconfig.base.json", "./"]
 # copy all related packages
 # copy all related packages
 COPY packages/app packages/app
 COPY packages/app packages/app