Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
make bin

FROM node:14.17-alpine3.13 AS client-builder
FROM node:18-alpine AS client-builder
WORKDIR /ui
# cache packages in layer
COPY ui/package.json ui/package-lock.json ./
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,7 @@ enable-debug-mode:
## Build the extension and install it
build-dev: extension-remove extension-build extension-install enable-debug-mode

docker:
docker compose up --build

.PHONY: buildx-prepare push-extension extension ui bin build-dev enable-debug-mode extension-install extension-link extension-reset extension-remove
5 changes: 4 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
version: "3"
services:
meshery-proxy:
image: ${DESKTOP_PLUGIN_IMAGE}
build:
context: .
dockerfile: Dockerfile
image: ${DESKTOP_PLUGIN_IMAGE:-layer5/kanvas-docker-extension:edge-dev}
ports:
- "7877:7877"
meshery:
Expand Down