Skip to content

Commit 94b59dc

Browse files
authored
Merge pull request #39 from saurabhraghuvanshii/docker-improve
chore: update `dockerfile node` version and `docker compose` and `makefile`
2 parents 335d1eb + 2fef110 commit 94b59dc

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
1313
--mount=type=cache,target=/root/.cache/go-build \
1414
make bin
1515

16-
FROM node:14.17-alpine3.13 AS client-builder
16+
FROM node:18-alpine AS client-builder
1717
WORKDIR /ui
1818
# cache packages in layer
1919
COPY ui/package.json ui/package-lock.json ./

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,7 @@ enable-debug-mode:
8181
## Build the extension and install it
8282
build-dev: extension-remove extension-build extension-install enable-debug-mode
8383

84+
docker:
85+
docker compose up --build
86+
8487
.PHONY: buildx-prepare push-extension extension ui bin build-dev enable-debug-mode extension-install extension-link extension-reset extension-remove

docker-compose.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
version: "3"
22
services:
33
meshery-proxy:
4-
image: ${DESKTOP_PLUGIN_IMAGE}
4+
build:
5+
context: .
6+
dockerfile: Dockerfile
7+
image: ${DESKTOP_PLUGIN_IMAGE:-layer5/kanvas-docker-extension:edge-dev}
58
ports:
69
- "7877:7877"
710
meshery:

0 commit comments

Comments
 (0)