Skip to content

Commit 0afb45a

Browse files
committed
fix(corepack): resolve corepack key id issue
1 parent 6c719b7 commit 0afb45a

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

tools/docker/Dockerfile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@ ARG TARGETPLATFORM
3333
ARG TARGETARCH
3434
ARG BUILDPLATFORM
3535

36-
RUN set -ex
37-
echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
38-
uname -a
39-
true
36+
RUN set -ex; \
37+
echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"; \
38+
uname -a; \
39+
true
4040

4141
# replace `amd64` with `x86_64` for `node`
4242
ENV ARCH=${TARGETARCH/amd64/x86_64}
4343
ENV ARCH=${ARCH/arm64/aarch64}
4444

4545
# fetch static node binary
46-
RUN set -ex
47-
ver=$(node --version)
48-
ver=${ver:1} \
49-
temp_dir="$(mktemp -d)"
50-
curl -fsSL "https://github.com/containerbase/node-prebuild/releases/download/${ver}/node-${ver}-${ARCH}.tar.xz" -o ${temp_dir}/node.tar.xz
51-
bsdtar --strip 1 -C ${temp_dir} -xf ${temp_dir}/node.tar.xz
52-
cp ${temp_dir}/bin/node ./node
53-
true
46+
RUN set -ex; \
47+
ver=$(node --version); ver=${ver:1} \
48+
temp_dir="$(mktemp -d)"; \
49+
curl -fsSL "https://github.com/containerbase/node-prebuild/releases/download/${ver}/node-${ver}-${ARCH}.tar.xz" -o ${temp_dir}/node.tar.xz; \
50+
bsdtar --strip 1 -C ${temp_dir} -xf ${temp_dir}/node.tar.xz; \
51+
cp ${temp_dir}/bin/node ./node; \
52+
true
5453

5554
# fetch npm packages
5655
ENV CI=1 npm_config_modules_cache_max_age=0 \
5756
npm_config_loglevel=info
5857

58+
5959
# replace `amd64` with `x64` for `node`
6060
ENV ARCH=${TARGETARCH/amd64/x64}
6161

@@ -66,16 +66,16 @@ COPY --link pnpm-lock.yaml ./
6666
ENV npm_config_arch=${ARCH} npm_config_platform_arch=${ARCH}
6767

6868
# only fetch deps from lockfile https://pnpm.io/cli/fetch
69-
RUN set -ex
70-
corepack pnpm fetch --prod
71-
true
69+
RUN set -ex; \
70+
corepack pnpm fetch --prod; \
71+
true
7272

7373
COPY --link . ./
7474

7575
# install npm packages
76-
RUN set -ex
77-
corepack pnpm install --prod --offline --ignore-scripts
78-
true
76+
RUN set -ex; \
77+
corepack pnpm install --prod --offline --ignore-scripts; \
78+
true
7979

8080
# --------------------------------------
8181
# final image
@@ -101,15 +101,15 @@ COPY --link --from=build --chown=root:root /usr/local/renovate/ /usr/local/renov
101101
RUN ln -sf /usr/local/renovate/node /bin/node
102102

103103
# ensure default base and cache directories exist.
104-
RUN mkdir -p /tmp/renovate/cache &&
104+
RUN mkdir -p /tmp/renovate/cache && \
105105
chmod -R 777 /tmp/renovate
106106

107107
# test
108-
RUN set -ex
109-
renovate --version
110-
pushd /usr/local/renovate/
111-
node -e "new require('re2')('.*').exec('test');new require('better-sqlite3')(':memory:')"
112-
true
108+
RUN set -ex; \
109+
renovate --version; \
110+
pushd /usr/local/renovate/; \
111+
node -e "new require('re2')('.*').exec('test');new require('better-sqlite3')(':memory:')"; \
112+
true
113113

114114
LABEL \
115115
org.opencontainers.image.version="${RENOVATE_VERSION}" \

0 commit comments

Comments
 (0)