Merge branch 'master' of gitlab.com:codespaces/codespace-docker

Author: Meenachisundaram Velmurugan

codebox/128.png

@@ -8,19 +8,11 @@ RUN apt-get update && \
 	apt-get install -y make g++ python git curl wget openssh-server sudo vim libdevmapper-dev && \
 	curl -sL https://deb.nodesource.com/setup | sudo bash - && \
 	apt-get install -y nodejs && \
-	npm -g install node-gyp codebox && \
-	cd /usr/lib/node_modules/codebox/node_modules/shux/node_modules/pty.js && \
+	npm -g install node-gyp akurath && \
+	cd /usr/lib/node_modules/akurath/node_modules/shux/node_modules/pty.js && \
 	make clean && \
 	make
 
-ENV CODEBOX_USERNAME your_username
-ENV CODEBOX_PASSWORD password
-
-COPY 128.png /usr/lib/node_modules/codebox/client/build/static/images/icons
-
-RUN chown nobody.root /usr/lib/node_modules/codebox/client/build/static/images/icons/128.png && \
-    chmod 644 /usr/lib/node_modules/codebox/client/build/static/images/icons/128.png
-
 RUN mkdir /var/run/sshd && \
     wget -qO- https://get.docker.com/ | sh && \
     curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \
@@ -35,10 +27,8 @@ RUN chmod +x /opt/motd.sh && \
 RUN useradd -ms /bin/bash devops && \
     echo 'devops:codespaces' |chpasswd && \
     adduser devops sudo && \
-    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+    echo 'devops ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 EXPOSE 22 8000
 
-ADD ./entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
+CMD /usr/bin/akurath run

codebox/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo 'PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KICAg
+ICAgICAgICAgICAgXyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICBfX18g
+X19fICAgX198IHwgX19fICBfX18gXyBfXyAgIF9fIF8gIF9fXyBfX18gIF9fXyAKIC8gX18vIF8g
+XCAvIF9gIHwvIF8gXC8gX198ICdfIFwgLyBfYCB8LyBfXy8gXyBcLyBfX3wKfCAoX3wgKF8pIHwg
+KF98IHwgIF9fL1xfXyBcIHxfKSB8IChffCB8IChffCAgX18vXF9fIFwKIFxfX19cX19fLyBcX18s
+X3xcX19ffHxfX18vIC5fXy8gXF9fLF98XF9fX1xfX198fF9fXy8KICAgICAgICAgICAgICAgICAg
+ICAgICAgICB8X3wgICAgICAgICAgICAgICAgICAgICAgICAKCiBEZXZvcHMgV29ya3NwYWNlcyBp
+biBhIEJveCAhICAgICAgd3d3LmNvZGVzcGFjZXMuaW8KCj09PT09PT09PT09PT09PT09PT09PT09
+PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cgo=' | base64 --decode > /etc/motd

codebox/motd.sh

@@ -6,20 +6,17 @@ networks:
 
 services:
   docker:
-    image: schoolofdevops/docker-controller:v1.0
+    image: docker-controller
     ports:
       - "8000:8000"
-      - "2222:22"
       - "80:80"
     environment:
-      CODEBOX_USERNAME: devops
-      CODEBOX_PASSWORD: codespaces
       JAVA_ARGS: "-Xms256m -Xmx256m -XX:MaxPermSize=256m"
     volumes:
       - /control:/workspace
       - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - codespace
+    network_mode: host
     container_name: docker
-    domainname: schoolofdevops.com
+    domainname: codespaces.io
     hostname: docker
+    restart: always

codebox/Dockerfile renamed to controller/Dockerfile

@@ -18,7 +18,7 @@ services:
     networks:
       - custom
     container_name: control
-    domainname: schoolofdevops.com
+    domainname: codespaces.io
     hostname: control
   lb:
     image: schoolofdevops/centos-node:v1.1
@@ -28,7 +28,7 @@ services:
        - "8080:80"
     networks:
       - custom
-    domainname: schoolofdevops.com
+    domainname: codespaces.io
     hostname: lb
   app1:
     image: schoolofdevops/centos-node:v1.1
@@ -38,7 +38,7 @@ services:
     networks:
       - custom
     container_name: app1
-    domainname: schoolofdevops.com
+    domainname: codespaces.io
     hostname: app1
   app2:
     image: schoolofdevops/ubuntu-node:v1.1
@@ -48,7 +48,7 @@ services:
     networks:
       - custom
     container_name: app2
-    domainname: schoolofdevops.com
+    domainname: codespaces.io
     hostname: app2
   db:
     image: schoolofdevops/centos-node:v1.1
@@ -58,5 +58,5 @@ services:
     networks:
       - custom
     container_name: db
-    domainname: schoolofdevops.com
+    domainname: codespaces.io
     hostname: db