Merge branch 'hotfix-0.1.3' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.3
+  - Upgrade baseimage: light-baseimage:0.2.5
+  - Add TINC_CMD_ARGS environment variable
+  - Compile tinc from sources
+
+## 0.1.2 (unreleased)
+
 ## 0.1.1
   - Upgrade baseimage: experimental-light-baseimage:0.1.3
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/tinc
-VERSION = 0.1.1
+VERSION = 0.1.3
 
 .PHONY: all build build-nocache test tag_latest release
 
@@ -15,7 +15,7 @@ test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
 tag_latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME):$(VERSION) $(NAME):latest
 
 release: build test tag_latest
 	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi

image/Dockerfile

@@ -1,13 +1,43 @@
-FROM osixia/experimental-light-baseimage:0.1.3
+# Use osixia/light-baseimage
+# sources: https://github.com/osixia/docker-light-baseimage
+FROM osixia/light-baseimage:0.2.5
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
-# Install OpenLDAP, ldap-utils and ssl-helper from baseimage and remove default ldap db
-# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-service-available
-RUN echo "deb http://http.debian.net/debian experimental main" >> /etc/apt/sources.list && apt-get -y update \
-	  && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-	     -t experimental tinc  \
-		&& apt-get clean \
-		&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+# Tinc version
+ENV TINC_VERSION 1.1pre14
+
+# Download, build and install Tinc
+RUN apt-get -y update \
+    && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+			 ca-certificates \
+			 curl \
+       gcc \
+       libssl1.0.0 \
+       libssl-dev \
+       liblzo2-2 \
+       liblzo2-dev \
+       libncurses5 \
+			 libncurses5-dev \
+       libreadline6 \
+			 libreadline-dev \
+       make \
+       pkg-config \
+       zlib1g \
+			 zlib1g-dev \
+    && curl -o tinc.tar.gz -SL https://www.tinc-vpn.org/packages/tinc-${TINC_VERSION}.tar.gz \
+    && mkdir -p /container/tinc-sources \
+    && tar -xzf tinc.tar.gz --strip 1 -C /container/tinc-sources \
+    && cd /container/tinc-sources \
+    && ./configure \
+    && make && make install \
+    && cd - \
+    && mkdir -p /usr/local/var/run/ \
+    && apt-get remove -y --purge --auto-remove ca-certificates curl gcc  \
+		   libssl-dev liblzo2-dev libncurses5-dev libreadline-dev make pkg-config zlib1g-dev \
+    && rm -f tinc.tar.gz \
+    && rm -rf /container/tinc-sources \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Add service directory to /container/service
 ADD service /container/service

image/environment/default.startup.yaml

@@ -0,0 +1,5 @@
+TINC_RUN_BEFORE_START_COMMANDS:
+  - add Address = 1.1.1.1
+  - add Subnet = 10.244.1.0/24
+  - add Mode = switch
+  - add DeviceType = tap

image/environment/default.yaml

@@ -1,5 +1,2 @@
-TINC_RUN_BEFORE_START_COMMANDS:
-  - add Address = 1.1.1.1
-  - add Subnet = 10.244.1.0/24
-  - add Mode = switch
-  - add DeviceType = tap
+# more info: https://www.tinc-vpn.org/documentation/tincd.8
+TINC_CMD_ARGS: --debug=3

image/service/tinc/process.sh

@@ -4,4 +4,4 @@
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
 log-helper level eq trace && set -x
 
-exec tinc -c ${CONTAINER_SERVICE_DIR}/tinc/data start -D
+exec tincd --config ${CONTAINER_SERVICE_DIR}/tinc/data --no-detach $TINC_CMD_ARGS

image/service/tinc/startup.sh

@@ -10,13 +10,13 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
   mkdir -p ${CONTAINER_SERVICE_DIR}/tinc/data
 
-  TINC_HOSTNAME=$(echo $HOSTNAME | sed -e 's/[^a-zA-Z0-9\-]/_/g')
-  tinc -c ${CONTAINER_SERVICE_DIR}/tinc/data init $TINC_HOSTNAME
+  TINC_HOSTNAME=$(echo $HOSTNAME | sed -e 's/[^a-zA-Z0-9\_]/_/g')
+  tinc --config ${CONTAINER_SERVICE_DIR}/tinc/data init $TINC_HOSTNAME
 
   for command in $(complex-bash-env iterate TINC_RUN_BEFORE_START_COMMANDS)
   do
     log-helper info "Run tinc command: ${!command}"
-    tinc -c ${CONTAINER_SERVICE_DIR}/tinc/data ${!command}
+    tinc --config ${CONTAINER_SERVICE_DIR}/tinc/data ${!command}
   done
 
 fi

test/test_helper.bash

@@ -30,19 +30,10 @@ clear_container() {
   remove_containers_by_cid $CONTAINER_ID
 }
 
-is_service_running() {
-  is_service_running_by_cid $CONTAINER_ID $1
+wait_process() {
+  wait_process_by_cid $CONTAINER_ID $@
 }
 
-is_file_exists() {
-  is_file_exists_by_cid $CONTAINER_ID $1
-}
-
-wait_service() {
-  wait_service_by_cid $CONTAINER_ID $@
-}
-
-
 # generic functions
 get_container_ip_by_cid() {
   local IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $1)
@@ -78,30 +69,7 @@ clear_containers_by_cid() {
   remove_containers_by_cid $@
 }
 
-is_service_running_by_cid() {
-  docker exec $1 ps cax | grep $2  > /dev/null
-}
-
-is_file_exists_by_cid() {
-  docker exec $1 cat $2 > /dev/null 2>&1
-}
-
-wait_service_by_cid() {
-
+wait_process_by_cid() {
   cid=$1
-
-  # first wait image init end
-  while ! is_file_exists_by_cid $cid /container/run/state/startup-done
-  do
-    sleep 0.5
-  done
-
-  for service in "${@:2}"
-  do
-    # wait service
-    while ! is_service_running_by_cid $cid $service
-    do
-      sleep 0.5
-    done
-  done
+  docker exec $cid /container/tool/wait-process ${@:2}
 }