conlink 2.5.0 → 2.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Dockerfile +3 -3
- package/package.json +1 -1
- package/src/conlink/core.cljs +2 -1
package/Dockerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
FROM node:16
|
|
1
|
+
FROM node:16 AS build
|
|
2
2
|
|
|
3
3
|
RUN apt-get -y update && \
|
|
4
4
|
apt-get -y install libpcap-dev default-jdk-headless
|
|
@@ -19,7 +19,7 @@ RUN cd /app && \
|
|
|
19
19
|
shadow-cljs compile conlink && \
|
|
20
20
|
chmod +x build/*.js
|
|
21
21
|
|
|
22
|
-
FROM node:16-slim
|
|
22
|
+
FROM node:16-slim AS run
|
|
23
23
|
|
|
24
24
|
RUN apt-get -y update
|
|
25
25
|
# Runtime deps and utilities
|
|
@@ -31,5 +31,5 @@ COPY --from=build /app/ /app/
|
|
|
31
31
|
ADD link-add.sh link-del.sh link-mirred.sh link-forward.sh /app/
|
|
32
32
|
ADD schema.yaml /app/build/
|
|
33
33
|
|
|
34
|
-
ENV PATH
|
|
34
|
+
ENV PATH=/app:$PATH
|
|
35
35
|
WORKDIR /app
|
package/package.json
CHANGED
package/src/conlink/core.cljs
CHANGED
|
@@ -663,7 +663,8 @@ General Options:
|
|
|
663
663
|
[container (inspect-container container-obj)
|
|
664
664
|
clabels (get-compose-labels container)
|
|
665
665
|
svc-num (:container-number clabels)]
|
|
666
|
-
{:
|
|
666
|
+
{:id (:Id container)
|
|
667
|
+
:name (->> container :Name (re-seq #"(.*/)?(.*)") first last)
|
|
667
668
|
:index (if svc-num (js/parseInt svc-num) 1)
|
|
668
669
|
:service (:service clabels)
|
|
669
670
|
:pid (-> container :State :Pid)
|