Skip to content

Commit 0d092b7

Browse files
committed
chore: fix docker smoke test
1 parent 7e6ff71 commit 0d092b7

File tree

5 files changed

+23
-46
lines changed

5 files changed

+23
-46
lines changed

Dockerfile

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,20 @@
11
FROM node:alpine
22

33
WORKDIR /build
4-
5-
# Copy files required for npm install only
6-
COPY package.json package-lock.json /build/
7-
COPY packages/cli/package.json /build/packages/cli/
8-
COPY packages/core/package.json /build/packages/core/
9-
COPY packages/cli/bin/ /build/packages/cli/bin/
10-
11-
RUN npm ci --no-optional --ignore-scripts
12-
13-
# Copy rest of the files
14-
COPY . /build/
15-
RUN npm run prepare
16-
17-
# Install redocly-cli globally, similar to npm install --global @redocly/cli
18-
# but the local package is used here
19-
RUN apk update && apk add jq && \
20-
apk add git && \
4+
COPY . .
5+
RUN apk add --no-cache jq git && \
6+
npm ci --no-optional --ignore-scripts && \
7+
npm run prepare && \
218
npm run pack:prepare && \
22-
npm install --global redocly-cli.tgz
23-
24-
# npm pack in the previous RUN command does not include these assets
25-
RUN cp packages/cli/src/commands/preview-docs/preview-server/default.hbs /usr/local/lib/node_modules/@redocly/cli/lib/commands/preview-docs/preview-server/default.hbs && \
26-
cp packages/cli/src/commands/preview-docs/preview-server/hot.js /usr/local/lib/node_modules/@redocly/cli/lib/commands/preview-docs/preview-server/hot.js && \
27-
cp packages/cli/src/commands/build-docs/template.hbs /usr/local/lib/node_modules/@redocly/cli/lib/commands/build-docs/template.hbs
28-
29-
# Clean up to reduce image size
30-
RUN npm cache clean --force && rm -rf /build
9+
npm install --global redocly-cli.tgz && \
10+
cp packages/cli/src/commands/preview-docs/preview-server/default.hbs \
11+
packages/cli/src/commands/preview-docs/preview-server/hot.js \
12+
/usr/local/lib/node_modules/@redocly/cli/lib/commands/preview-docs/preview-server/ && \
13+
cp packages/cli/src/commands/build-docs/template.hbs \
14+
/usr/local/lib/node_modules/@redocly/cli/lib/commands/build-docs/ && \
15+
# Clean up to reduce image size
16+
npm cache clean --force && rm -rf /build
3117

3218
WORKDIR /spec
33-
34-
ENTRYPOINT [ "redocly" ]
35-
19+
ENTRYPOINT ["redocly"]
3620
ENV REDOCLY_ENVIRONMENT=docker

package-lock.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"description": "",
55
"license": "MIT",
66
"bin": {
7-
"openapi": "bin/cli.js",
8-
"redocly": "bin/cli.js"
7+
"redocly": "bin/cli.js",
8+
"openapi": "bin/cli.js"
99
},
1010
"engines": {
1111
"node": ">=18.17.0",

packages/respect-core/package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,5 @@
7474
},
7575
"files": [
7676
"lib"
77-
],
78-
"publishConfig": {
79-
"access": "public",
80-
"registry": "https://registry.npmjs.org/"
81-
}
77+
]
8278
}

scripts/local-pack.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,23 @@ cp packages/core/package.json packages/core/package.json.bak
55
cp packages/respect-core/package.json packages/respect-core/package.json.bak
66
cp packages/cli/package.json packages/cli/package.json.bak
77

8-
# Generate timestamp-based version
9-
TIMESTAMP=$(date +%s)
10-
VERSION="0.0.0-snapshot.$TIMESTAMP"
11-
128
# Build and pack core package
139
cd packages/core
14-
jq ".version = \"$VERSION\"" package.json > tmp.json && mv tmp.json package.json
1510
core=$(npm pack | tail -n 1)
1611
mv $core ../../openapi-core.tgz
1712
cd ../../
1813

1914
# Update and pack respect-core package
2015
cd packages/respect-core
21-
jq ".version = \"$VERSION\"" package.json > tmp.json && mv tmp.json package.json
22-
jq ".dependencies[\"@redocly/openapi-core\"] = \"./openapi-core.tgz\"" package.json > tmp.json && mv tmp.json package.json
16+
jq '.dependencies["@redocly/openapi-core"] = "./openapi-core.tgz"' package.json > tmp.json && mv tmp.json package.json
2317
respect_core=$(npm pack | tail -n 1)
2418
mv $respect_core ../../respect-core.tgz
2519
cd ../../
2620

2721
# Update and pack cli package
2822
cd packages/cli
29-
jq ".version = \"$VERSION\"" package.json > tmp.json && mv tmp.json package.json
30-
jq ".dependencies[\"@redocly/openapi-core\"] = \"./openapi-core.tgz\"" package.json > tmp.json && mv tmp.json package.json
31-
jq ".dependencies[\"@redocly/respect-core\"] = \"./respect-core.tgz\"" package.json > tmp.json && mv tmp.json package.json
23+
jq '.dependencies["@redocly/openapi-core"] = "./openapi-core.tgz"' package.json > tmp.json && mv tmp.json package.json
24+
jq '.dependencies["@redocly/respect-core"] = "./respect-core.tgz"' package.json > tmp.json && mv tmp.json package.json
3225
cli=$(npm pack | tail -n 1)
3326
mv $cli ../../redocly-cli.tgz
3427
cd ../../

0 commit comments

Comments
 (0)