laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(docker.cross): packages/client の yarn install はnativeじゃないほうではしない

Browse Source
This commit is contained in:
rinsuki 2022-04-16 01:03:24 +09:00
parent b803279b2a
commit 33e2ccd809
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile.cross
View File

@ -12,12 +12,12 @@ FROM native_base AS native_cache_builder
COPY . ./ COPY . ./
RUN apk add --no-cache $BUILD_DEPS && \ RUN apk add --no-cache $BUILD_DEPS && \
git submodule update --init && \
yarn install yarn install
FROM native_cache_builder as native_builder FROM native_cache_builder as native_builder
RUN yarn build && \ RUN git submodule update --init && \
yarn build && \
rm -rf .git rm -rf .git
# --- # ---
@ -38,7 +38,7 @@ FROM base as deps_builder
RUN apk add --no-cache $BUILD_DEPS RUN apk add --no-cache $BUILD_DEPS
COPY --from=native_cache_builder /usr/local/share/.cache/yarn /usr/local/share/.cache/yarn COPY --from=native_cache_builder /usr/local/share/.cache/yarn /usr/local/share/.cache/yarn
RUN yarn install RUN SKIP_CLIENT=YES yarn install
FROM base AS runner FROM base AS runner
@ -52,7 +52,6 @@ ENTRYPOINT ["/sbin/tini", "--"]
COPY --from=deps_builder /misskey/node_modules ./node_modules COPY --from=deps_builder /misskey/node_modules ./node_modules
COPY --from=deps_builder /misskey/packages/backend/node_modules ./packages/backend/node_modules COPY --from=deps_builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
COPY --from=deps_builder /misskey/packages/client/node_modules ./packages/client/node_modules
COPY --from=native_builder /misskey/packages/backend/built ./packages/backend/built COPY --from=native_builder /misskey/packages/backend/built ./packages/backend/built
COPY --from=native_builder /misskey/built ./built COPY --from=native_builder /misskey/built ./built

14
scripts/install-packages.js
View File

@ -9,11 +9,13 @@ const execa = require('execa');
stderr: process.stderr, stderr: process.stderr,
}); });
console.log('installing dependencies of packages/client ...'); if (process.env.SKIP_CLIENT !== "YES") {
console.log('installing dependencies of packages/client ...');
await execa('yarn', ['install'], { await execa('yarn', ['install'], {
cwd: __dirname + '/../packages/client', cwd: __dirname + '/../packages/client',
stdout: process.stdout, stdout: process.stdout,
stderr: process.stderr, stderr: process.stderr,
}); });
}
})(); })();