Commit 75cf59bf authored by jan.koester's avatar jan.koester
Browse files

test

parent a425dba0

src/containerctl.cpp

+2 −0
Changes for src/containerctl.cpp: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 *   containerctl create web image=nginx network=bridge bridge=br0 \

 *                address=192.168.1.50/24 gateway=192.168.1.1 autostart=yes

 *   containerctl edit web address6=2001:db8::50/64 gateway6=fe80::1

 *   containerctl edit web dhcp6=yes          DHCPv6 when the router asks for it

 *   containerctl edit web env=TZ=Europe/Berlin bind=/srv/www:/usr/share/nginx/html:ro

 *   containerctl start|stop|restart|rm web  containerctl kill web [HUP]

 *   containerctl recreate web               its changes go: fresh from the image
@@ -286,6 +287,7 @@ int main(int argc, char **argv) { 
            std::string addr = get(c, "network") != "bridge" ? get(c, "network")

                             : get(c, "address") == "dhcp" ? "dhcp:" + get(c, "lease") : get(c, "address");

            if (!get(c, "address6").empty()) addr += (addr.empty() ? "" : ",") + get(c, "address6");

            if (!get(c, "lease6").empty()) addr += (addr.empty() ? "" : ",") + "dhcp6:" + get(c, "lease6");

            printf("%-20s %-10s %-8s %-18s %s\n", get(c, "container").c_str(), state.c_str(), pid.c_str(), addr.c_str(),

                   get(c, "image").c_str());

        }

src/containers.cpp

+1 −0
Changes for src/containers.cpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ Result startOne(const std::string &name) { 
    }

    err = prepare(s);

    if (!err.empty()) return fail(err, 500);

    l.nameservers = nameservers(s);

    mkdirs(RunDir, 0755);

    unlink(runFile(name, ".exit").c_str());

    writeFile(runFile(name, ".layers"), join(l.image.layers, "\n") + "\n");