[NETBEANS-2509] Bring back docker plugin support for unix sockets #1242

Ihsahn · 2019-05-09T20:33:57Z

Restore ability to connect to docker via unix socket, replaced no-longer existing socket access library with (wrapped) com.kohlschutter.junixsocket (Apache License).

Checked on linux/amd64 - I was able to connect and list images/containers.

ps. according to junixsocket docs this should also work on linux/aarch64 and macos, but since I don't have ability to test on these I'm not enabling them (yet)

sdedic · 2019-05-09T21:02:32Z

ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java

-//        }
-//        String arch = System.getProperty("os.arch"); // NOI18N
-//        return arch != null && (arch.contains("x86") || arch.contains("amd64")); // NOI18N
+        if (BaseUtilities.getOperatingSystem() != BaseUtilities.OS_LINUX) {


What about MacOS X ? junixsocket's documenation says it supports mac too...

I stated this at the very top already: I don't have ability to verify this on linux/aarch64 and macos

Is there a reason to doubt, that this will work on Mac OS X? If not I would enable it there also (I'm assuming, that docker on Mac OS X also uses unix domain sockets).

addressed (afaik MacOs does allow connection via unix domain sockets)

matthiasblaesing · 2019-05-10T20:43:33Z

The binaries should not be checked in to git. The netbeans build system has its own code to download binaries at build time. The mechanism was updated to also work with maven central, when netbeans was donated to apache.

For a sample have a look at the jna module: platform/libs.jna. There are two things you'll need:

external/binaries-list: This lists the binaries with SHA1 sums
external/<binary-name>-<version>-license.txt with the license information about the file

JaroslavTulach · 2019-05-12T07:53:23Z

ide/libs.c.kohlschutter.junixsocket/build.xml

+-->
+<project name="ide/libs.c.kohlschutter.junixsocket" default="build" basedir=".">
+    <import file="../../nbbuild/templates/projectized.xml"/>
+</project>


The library seems to be on Maven central. Make sure to create external/binaries-files to download the JARs from Maven central instead of having them in the Git repository.

matthiasblaesing

Thank you for the update and move to maven central dependencies. I left some comments inline.

Please squash your commits and update the author information. Neither the realname part, nor the email part of the author information look right (https://www.git-tower.com/learn/git/faq/change-author-name-email / https://stackoverflow.com/questions/3042437/how-to-change-the-commit-author-for-one-specific-commit)

matthiasblaesing · 2019-05-14T18:26:18Z

ide/libs.c.kohlschutter.junixsocket/external/junixsocket-common-2.2.0-license.txt

@@ -0,0 +1,210 @@
+Name: junixsocket
+License: Apache-2.0
+OSR: 4300


This is an artifact from the oracle/sun era. Please remove.

matthiasblaesing · 2019-05-14T18:35:17Z

ide/libs.c.kohlschutter.junixsocket/external/junixsocket-common-2.2.0-license.txt

+OSR: 4300
+Description: junixsocket is a Java/JNI library that allows the use of Unix Domain Sockets (AF_UNIX sockets) from Java.
+Origin: https://github.com/kohlschutter/junixsocket/
+Version: 2.2.0


There is no need for three copies of the license file. Please remove two copies and rename the remaining copy to "junixsocket-license.txt". Add a new header line that references the three files:

Files: junixsocket-common-2.2.0.jar, junixsocket-core-2.2.0.jar, junixsocket-native-common-2.2.0.jar

What is more, the ALv2 requires to carry the NOTICE if the source package has one. In this case the original author failed to include it in his/her binaries, but we are good citizens of the ecosystem.

Here is the notice file:
https://github.com/kohlschutter/junixsocket/blob/master/NOTICE

Please add a file "junixsocket-notice.txt", with the contents of the above referenced file. The contents of that file will be picked up by the build system and integrated into the final notice file of NetBeans.

licenses/notice changed/updated

Some license files have incorrect headers ide/libs.c.kohlschutter.junixsocket/external/junixsocket-license.txt does not contain the version 2.2.0 in its name

and if I add version to this, than it states, that there are 3 files and only one license, and so on...

matthiasblaesing · 2019-05-14T18:40:54Z

ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java

-//        }
-//        String arch = System.getProperty("os.arch"); // NOI18N
-//        return arch != null && (arch.contains("x86") || arch.contains("amd64")); // NOI18N
+        if (BaseUtilities.getOperatingSystem() != BaseUtilities.OS_LINUX) {


Is there a reason to doubt, that this will work on Mac OS X? If not I would enable it there also (I'm assuming, that docker on Mac OS X also uses unix domain sockets).

matthiasblaesing · 2019-05-15T19:05:48Z

This looks reasonably sane. Your test-failure is explainable, as I gave you the wrong filenames, sorry about that. Please move the license and notice to junixsocket-2.2.0-license.txt and junixsocket-2.2.0-notice.txt. I'd also make the junixsocket library friend-only for now. That way we know which modules to check when we update the library. This can be done in the GUI (Project Properties -> API Versionioning -> Export Packages only to Friends. Or directly in the project.xml:

<!-- ... -->
            <!-- Remove public-packages element -->
            <friend-packages>
                <friend>org.netbeans.modules.docker.api</friend>
                <package>org.newsclub.net.unix</package>
            </friend-packages>
<!-- ... -->

Ihsahn · 2019-05-16T04:03:44Z

This looks reasonably sane. Your test-failure is explainable, as I gave you the wrong filenames, sorry about that. Please move the license and notice to junixsocket-2.2.0-license.txt and junixsocket-2.2.0-notice.txt. I'd also make the junixsocket library friend-only for now. That way we know which modules to check when we update the library. This can be done in the GUI (Project Properties -> API Versionioning -> Export Packages only to Friends. Or directly in the project.xml:

Done.

neilcsmith-net · 2019-05-16T08:37:55Z

I'd also make the junixsocket library friend-only for now. That way we know which modules to check when we update the library.

-0 That doesn't seem the best reason to do that?! I'm not a fan of the friend concept in general, particularly with third-party libraries. Anything adding in native libraries that way can be a real pain for platform / plugin developers.

matthiasblaesing · 2019-05-16T17:55:35Z

Ok - I take your point Neil. To no play request ping-pong, I rebased the changeset onto master, reopened the library module and merged it to master (0d3a544).

Thank you for your contribution Bartosz.

Ihsahn changed the title ~~[NETBEANS-2509' Bring back docker plugin support for unix sockets~~ [NETBEANS-2509] Bring back docker plugin support for unix sockets May 9, 2019

sdedic reviewed May 9, 2019

View reviewed changes

JaroslavTulach reviewed May 12, 2019

View reviewed changes

matthiasblaesing requested changes May 14, 2019

View reviewed changes

Bring back docker plugin support for unix sockets

2048e10

matthiasblaesing closed this May 16, 2019

Ihsahn deleted the feat/junixsocket branch February 24, 2020 06:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NETBEANS-2509] Bring back docker plugin support for unix sockets #1242

[NETBEANS-2509] Bring back docker plugin support for unix sockets #1242

Ihsahn commented May 9, 2019

sdedic May 9, 2019

Ihsahn May 10, 2019

matthiasblaesing May 14, 2019

Ihsahn May 14, 2019

matthiasblaesing commented May 10, 2019

JaroslavTulach May 12, 2019

matthiasblaesing left a comment

matthiasblaesing May 14, 2019

Ihsahn May 14, 2019

matthiasblaesing May 14, 2019

Ihsahn May 14, 2019

Ihsahn May 15, 2019

matthiasblaesing May 14, 2019

matthiasblaesing commented May 15, 2019

Ihsahn commented May 16, 2019

neilcsmith-net commented May 16, 2019

matthiasblaesing commented May 16, 2019

[NETBEANS-2509] Bring back docker plugin support for unix sockets #1242

[NETBEANS-2509] Bring back docker plugin support for unix sockets #1242

Conversation

Ihsahn commented May 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthiasblaesing commented May 10, 2019

Choose a reason for hiding this comment

matthiasblaesing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthiasblaesing commented May 15, 2019

Ihsahn commented May 16, 2019

neilcsmith-net commented May 16, 2019

matthiasblaesing commented May 16, 2019