Skip to content

Commit 36b1967

Browse files
committed
2 parents fc3f922 + 97a2c71 commit 36b1967

File tree

12 files changed

+100
-81
lines changed

12 files changed

+100
-81
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🙋🏾🙋🏼‍Question
4+
url: https://discuss.layer5.io
5+
about: Submit your question on the discussion forum.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/multi-platform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
type=raw,pattern={{version}},value=${{env.RELEASE_CHANNEL}}-${{env.GIT_VERSION}}
9696
type=raw,value=${{env.RELEASE_CHANNEL}}-{{tag}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
9797
type=raw,value=${{env.RELEASE_CHANNEL}}-latest
98-
type=semver,pattern={{version}},value=${{env.RELEASE_CHANNEL}}-${{env.GIT_VERSION}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
98+
type=raw,pattern={{version}},value=${{env.RELEASE_CHANNEL}}-${{env.GIT_VERSION}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
9999
- name: Login to DockerHub
100100
uses: docker/login-action@v3
101101
with:

.github/workflows/slack.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
name: Slack Notify
2-
on:
2+
3+
on:
34
watch:
45
types: [started]
6+
issues:
7+
types: [labeled]
8+
59
jobs:
610
star-notify:
711
if: github.event_name == 'watch'
812
name: Notify Slack on star
913
runs-on: ubuntu-latest
1014
steps:
11-
- name: Get current star count
12-
run: |
13-
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{github.repository}}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
14-
- name: Notify slack
15-
env:
16-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
17-
uses: pullreminders/slack-action@master
18-
with:
19-
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{github.repository}}! (https://github.com/${{github.repository}}/stargazers) Total ⭐️: ${{env.STARS}}\"}'
15+
- name: Get current star count
16+
run: |
17+
echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
18+
- name: Notify Slack
19+
env:
20+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
21+
uses: pullreminders/slack-action@master
22+
with:
23+
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"${{ github.actor }} just starred ${{ github.repository }}! (https://github.com/${{ github.repository }}/stargazers) Total ⭐️: ${{ env.STARS }}\"}'
24+
2025
good-first-issue-notify:
21-
if: github.event_name == 'issues' && github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only'
26+
if: github.event_name == 'issues' && (github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only')
2227
name: Notify Slack for new good-first-issue
2328
runs-on: ubuntu-latest
2429
steps:
25-
- name: Notify slack
30+
- name: Notify Slack
2631
env:
2732
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
2833
uses: pullreminders/slack-action@master
2934
with:
30-
args: '{\"channel\":\"C019426UBNY\",\"text\":\"A good first issue label was just added to ${{github.event.issue.html_url}}.\"}'
35+
args: '{\"channel\":\"C019426UBNY\",\"type\":\"section\",\"text\":\":new: Good first issue up for grabs: ${{ github.event.issue.title }} - ${{ github.event.issue.html_url }} \"}'
36+

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-alpine AS builder
1+
FROM golang:1.24-alpine AS builder
22
ENV CGO_ENABLED=0
33
RUN apk update && apk add gcc libc-dev make bash git
44
RUN apk add --no-cache bash
@@ -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

bin/service

-217 KB
Binary file not shown.

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:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/meshery-extension
22

3-
go 1.23
3+
go 1.24
44

55
require (
66
github.com/Microsoft/go-winio v0.6.0

ui/package-lock.json

Lines changed: 65 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)