Skip to content

Commit

Permalink
fix(nuxt): correct docker development stage
Browse files Browse the repository at this point in the history
  • Loading branch information
dargmuesli committed May 10, 2023
1 parent 5f33e09 commit 48d0901
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
6 changes: 4 additions & 2 deletions nuxt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ ENV CI=true

WORKDIR /srv/app/

COPY ./docker-entrypoint.sh /usr/local/bin/

RUN corepack enable

VOLUME /srv/.pnpm-store
VOLUME /srv/app

COPY ./docker-entrypoint.sh /usr/local/bin/

ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["pnpm", "run", "dev"]

Expand Down
3 changes: 2 additions & 1 deletion nuxt/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
set -e

# pnpm config set store-dir "/srv/.pnpm-store"
pnpm config set store-dir "/srv/.pnpm-store"
pnpm install
pnpm rebuild

exec "$@"
8 changes: 4 additions & 4 deletions nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"test": "vitest",
"test:integration:dev": "cross-env NUXT_PUBLIC_IS_TESTING=1 WAIT_ON_TIMEOUT=100000 start-server-and-test 'pnpm dev' 'http://localhost:3000' 'pnpm cypress:test'",
"test:integration:prod": "cross-env NUXT_PUBLIC_IS_TESTING=1 WAIT_ON_TIMEOUT=10000 NODE_ENV=production start-server-and-test 'pnpm start' 'http://localhost:3000' 'pnpm cypress:test'",
"test:integration:docker:build": "docker build -t test-integration_base --build-arg UID=$(id -u) --build-arg GID=$(id -g) --target test-integration_base ../",
"test:integration:docker:run": "docker run --rm -v \"$PWD/..:/srv/app\" -v \"$(pnpm store path):/srv/.pnpm-store\" test-integration_base",
"test:integration:docker:build": "docker build -t test-integration_base --build-arg UID=$(id -u) --build-arg GID=$(id -g) --target test-integration_base .",
"test:integration:docker:run": "docker run --rm -v \"$PWD:/srv/app\" -v \"$(pnpm store path):/srv/.pnpm-store\" test-integration_base",
"test:integration:docker:br": "pnpm test:integration:docker:build && pnpm test:integration:docker:run",
"test:integration:docker:dev": "pnpm test:integration:docker:br pnpm --dir nuxt test:integration:dev",
"test:integration:docker:prod": "pnpm test:integration:docker:br pnpm --dir nuxt test:integration:prod",
"test:integration:docker:dev": "pnpm test:integration:docker:br pnpm test:integration:dev",
"test:integration:docker:prod": "pnpm test:integration:docker:br pnpm test:integration:prod",
"lint": "pnpm lint:js && pnpm lint:ts && pnpm lint:style",
"lint:js": "eslint --cache --ext .js,.ts,.vue --ignore-path .gitignore .",
"lint:ts": "nuxt typecheck",
Expand Down

0 comments on commit 48d0901

Please sign in to comment.