Skip to content

Commit

Permalink
fix dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Ethan-Arrowood committed Dec 3, 2024
1 parent 525d0e5 commit 0610bfa
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 3 additions & 3 deletions extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import shellQuote from 'shell-quote';
* @property {boolean=} dev - Enable dev mode. Defaults to `false`.
* @property {string=} installCommand - A custom install command. Defaults to `npm install`.
* @property {number=} port - A port for the Next.js server. Defaults to the HarperDB HTTP Port.
* @property {number=} securePort - A (secure) port for the https Next.js server. Defaults to the HarperDB HTTPS Secure Port.
* @property {number=} securePort - A (secure) port for the https Next.js server. Defaults to the HarperDB HTTP Secure Port.
* @property {boolean=} prebuilt - Instruct the extension to skip executing the `buildCommand`. Defaults to `false`.
* @property {string=} subPath - A sub path for serving request from. Defaults to `''`.
*/
Expand Down Expand Up @@ -77,8 +77,8 @@ function resolveConfig(options) {
buildOnly: options.buildOnly ?? false,
dev: options.dev ?? false,
installCommand: options.installCommand ?? 'npm install',
port: options.port,
securePort: options.securePort,
port: options.port ?? options.server.config.http.port,
securePort: options.securePort ?? options.server.config.http.securePort,
prebuilt: options.prebuilt ?? false,
subPath: options.subPath ?? '',
cache: options.cache ?? false,
Expand Down
5 changes: 3 additions & 2 deletions util/docker/base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ ARG CACHE_BUST
RUN echo "${CACHE_BUST}"
COPY config.yaml extension.js cli.js package.json /@harperdb/nextjs/

WORKDIR /@harperdb/nextjs
# Install dependencies for the @harperdb/nextjs module
RUN npm install -C /@harperdb/nextjs
RUN npm install

# Create link to the @harperdb/nextjs module
RUN npm link -C /@harperdb/nextjs
RUN npm link
3 changes: 2 additions & 1 deletion util/docker/next.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ ARG CACHE_BUST
RUN echo "${CACHE_BUST}"
COPY fixtures/next-${NEXT_MAJOR} /hdb/components/next-${NEXT_MAJOR}

RUN cd hdb/components/next-${NEXT_MAJOR} && npm install
WORKDIR /hdb/components/next-${NEXT_MAJOR}
RUN npm install

EXPOSE 9925 9926

Expand Down

0 comments on commit 0610bfa

Please sign in to comment.