updated to use latest IncludeOS version

Author: ingve

containers/compilers/includeos/cpp/Dockerfile.common

@@ -3,7 +3,9 @@ MAINTAINER includeos.org
 RUN \
   apt-get update && \
   apt-get install -y bc git lsb-release sudo
-RUN useradd -m includeos && echo "includeos:includeos" | chpasswd && adduser includeos sudo
-RUN git clone https://github.com/hioa-cs/IncludeOS.git
-WORKDIR IncludeOS
-RUN /bin/bash install.sh
+RUN cd ~ && pwd && \
+  git clone https://github.com/hioa-cs/IncludeOS.git && \
+  cd IncludeOS && \
+  git checkout 8dfa8b661355fd79b68ae2396d8df99c07f7c9e3 && \
+  git fetch --tags && \
+  /bin/bash ./install.sh

containers/compilers/includeos/cpp/Dockerfile.hw

@@ -1,4 +1,4 @@
-FROM projectunik/compilers-includeos-cpp-common:df9c830467f8b120
+FROM projectunik/compilers-includeos-cpp-common:25a238e8a72a6388
 MAINTAINER includeos.org
 VOLUME /opt/code
 WORKDIR /opt/code

containers/versions.json

@@ -16,8 +16,8 @@
   "compilers-rump-python3-xen": "a1088c9cef821113",
   "compilers-rump-base-xen": "e8117ef5dddcdabe",
   "compilers-rump-base-hw": "d6f5c541f38f74bd",
-  "compilers-includeos-cpp-common": "df9c830467f8b120",
-  "compilers-includeos-cpp-hw": "7f19d78debeb0cc1",
+  "compilers-includeos-cpp-common": "25a238e8a72a6388",
+  "compilers-includeos-cpp-hw": "d42aa69e37ec6059",
   "rump-debugger-qemu": "49f1796b79f46203",
   "compilers-rump-base-common": "d16776a7c3dd168a",
   "image-creator": "fc2512fd8b56ad35",

docs/compilers/includeos.md

@@ -5,5 +5,3 @@ UniK uses [IncludeOS](http://www.includeos.org/) as a platform for compiling C++
 You can also see an [example here](https://github.com/includeos/unik_test_service)
 
 Your application code will be called from ```Service::start()``` in `service.cpp`
-
-Note the line `unik::register_instance();` in [service.cpp#L41](https://github.com/includeos/unik_test_service/blob/master/service.cpp#L41): this line (and the imported file `#include <unik>`) are required for registering instances of your application to UniK. Without this, UniK will be unable to determine and display IPs of your instances (they will run otherwise normally).

docs/getting_started_cpp.md

@@ -71,26 +71,21 @@ Ensure that each of the following are installed
 
   ```cpp
   #include <os>
-  #include "unik_register_instance.hpp"
+  #include <net/inet4>
 
   constexpr int port {8080};
-  std::unique_ptr<net::Inet4<VirtioNet>> inet;
 
-  void Service::start() {
+  void Service::start(const std::string&) {
     using namespace std::string_literals;
-    auto& eth0 = hw::Dev::eth<0, VirtioNet>();
-    inet = std::make_unique<net::Inet4<VirtioNet>>(eth0);
-    unik::register_instance();
-
-    auto& server = inet->tcp().bind(port);
-    server.onAccept([] (auto conn) -> bool {
-        return true; // allow all connections
-      })
-      .onConnect([] (auto conn) {
+
+    auto& server = net::Inet4::stack().tcp().bind(port);
+    server.on_connect([] (auto conn) {
+      conn->on_read(1024, [conn] (auto buf, size_t n) {
         auto response {"My first unikernel!\n"s};
-        conn->write(response.data(), response.size());
+        conn->write(response);
         conn->close();
       });
+    });
   }
   ```
 
@@ -107,9 +102,14 @@ Ensure that each of the following are installed
   # Your disk image
   DISK=
 
+  # Add networking driver
+  DRIVERS=virtionet
+
   # Your own include-path
   LOCAL_INCLUDES=
 
+  PLATFORM=unik
+
   # IncludeOS location
   ifndef INCLUDEOS_INSTALL
   INCLUDEOS_INSTALL=$(HOME)/IncludeOS_install
@@ -119,9 +119,7 @@ Ensure that each of the following are installed
   include $(INCLUDEOS_INSTALL)/Makeseed
   ```
 
-3. (In the very near future, this step will not be necessary, but since you are an early adopter, you will have to add an extra file. [Download the file from GitHub here](https://gist.githubusercontent.com/ingve/ae745418261c8871edf52e8dbdb29099/raw/86783f194f5b31556d242127d18f69b30b6c8c93/unik_register_instance.hpp) and add it to the same folder as `service.cpp`.)
-
-4. Great! Now we're ready to compile this code to a unikernel.
+3. Great! Now we're ready to compile this code to a unikernel.
 
 ---