Skip to content

Commit

Permalink
Merge pull request #3139 from vuestorefront/v2-develop
Browse files Browse the repository at this point in the history
chore: merge v2-develop into v2
  • Loading branch information
Szymon-dziewonski authored May 7, 2024
2 parents d18f86b + 2cfc6df commit 1e1693b
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 37 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
18 changes: 0 additions & 18 deletions .vuestorefrontcloud/demo/docker/Dockerfile

This file was deleted.

13 changes: 0 additions & 13 deletions .vuestorefrontcloud/demo/docker/default.conf

This file was deleted.

10 changes: 6 additions & 4 deletions .vuestorefrontcloud/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
## Debugging

You can debug dockerized docs image by following steps below:
- add `EXPOSE 80` command at the end of the Dockerfile in this folder next to this readme file,
- build image using `DOCKER_BUILDKIT=1 docker build -t docs --build-arg VITE_DOCS_BASEPATH=/v2/ -f .vuestorefrontcloud/docs/Dockerfile .`,
- run image using `docker run -p 48080:80 docs`,
- open browser and go to the address `localhost:48080/v2/index.html` to see the docs page running.

- build image using `DOCKER_BUILDKIT=1 docker build -t docs --build-arg VITE_DOCS_EXAMPLES_VUE_PATH=http://localhost:3001 --build-arg VITE_DOCS_EXAMPLES_REACT_PATH=http://localhost:3002 --build-arg VITE_DOCS_BASEPATH=/v2/ -f .vuestorefrontcloud/docs/Dockerfile .`,
- run image using `docker run -t -i -p 3000:80 docs`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965)
- open browser and go to the address `http://localhost:3000/v2/` to see the docs page running.

NOTE: docs will work but without `vue` and `react` showcases. For full docs experience you have to run `test-next` and `test-nuxt` docker as well.
2 changes: 1 addition & 1 deletion .vuestorefrontcloud/test-next/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20 AS build
FROM node:20-alpine AS build

WORKDIR /var/www

Expand Down
10 changes: 10 additions & 0 deletions .vuestorefrontcloud/test-next/docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Test-next

## Debugging

You can debug dockerized docs image by following steps below:

- run terminal in `root` directory
- build image using `DOCKER_BUILDKIT=1 docker build -t test-next -f .vuestorefrontcloud/test-next/docker/Dockerfile .`,
- run image using `docker run -t -i -p 3002:3000 test-next`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965)
- open browser and go to the address `http://localhost:3002` to see the app page running.
2 changes: 1 addition & 1 deletion .vuestorefrontcloud/test-nuxt/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20 AS build
FROM node:20-alpine AS build

WORKDIR /var/www

Expand Down
10 changes: 10 additions & 0 deletions .vuestorefrontcloud/test-nuxt/docker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Test-nuxt

## Debugging

You can debug dockerized docs image by following steps below:

- run terminal in `root` directory
- build image using `DOCKER_BUILDKIT=1 docker build -t test-nuxt -f .vuestorefrontcloud/test-nuxt/docker/Dockerfile .`,
- run image using `docker run -t -i -p 3001:3000 test-nuxt`, (flags `i` and `t` allows to run command and then kill it with `ctrl+c` https://github.com/moby/moby/issues/2838#issuecomment-29205965)
- open browser and go to the address `http://localhost:3001` to see the app page running.

0 comments on commit 1e1693b

Please sign in to comment.