aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-02-10 09:01:49 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2017-02-10 09:01:49 +0000
commitb5803432f6a14d2cfe19c0b74dcebf1f216c5d8f (patch)
tree0c0e6c56d9e88696dff768af79363a2da08158e5
parent37026fd715da5a17af80a2cf40cae5e1421af46f (diff)
xenial-*-tcwg-dev: Cleanup and unify.
Change-Id: Ia5b0f22a155f7cbe5d0ef1a978cfa4fa785f9c5b
-rwxr-xr-xxenial-amd64-tcwg-dev/start.sh2
-rw-r--r--xenial-arm64-tcwg-dev/Dockerfile2
-rwxr-xr-xxenial-arm64-tcwg-dev/build.sh5
-rwxr-xr-xxenial-arm64-tcwg-dev/run.sh4
-rwxr-xr-xxenial-arm64-tcwg-dev/start.sh4
5 files changed, 10 insertions, 7 deletions
diff --git a/xenial-amd64-tcwg-dev/start.sh b/xenial-amd64-tcwg-dev/start.sh
index 5a6212d..fdd85f1 100755
--- a/xenial-amd64-tcwg-dev/start.sh
+++ b/xenial-amd64-tcwg-dev/start.sh
@@ -16,7 +16,7 @@ else
fi
$DOCKER pull linaro/dev-amd64-tcwg-dev-ubuntu:xenial
-$DOCKER run --name=$USER-xenial -dt -p 127.0.0.1::22 -v $HOME:$HOME -v /home/tcwg-buildslave:/home/tcwg-buildslave:ro --memory=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G --pids-limit=5000 --cap-add=IPC_LOCK linaro/dev-amd64-tcwg-dev-ubuntu:xenial "$(getent passwd $USER)" "$(id -gn)" "$(/etc/ssh/ssh_keys.py $USER 2>/dev/null || sss_ssh_authorizedkeys $USER 2>/dev/null)"
+$DOCKER run --name=$USER-xenial -dt -p 22 -v $HOME:$HOME -v /home/tcwg-buildslave:/home/tcwg-buildslave:ro --memory=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G --pids-limit=5000 --cap-add=IPC_LOCK linaro/dev-amd64-tcwg-dev-ubuntu:xenial "$(getent passwd $USER)" "$(id -gn)" "$(/etc/ssh/ssh_keys.py $USER 2>/dev/null || sss_ssh_authorizedkeys $USER 2>/dev/null)"
port=$($DOCKER port $USER-xenial 22 | cut -d: -f 2)
diff --git a/xenial-arm64-tcwg-dev/Dockerfile b/xenial-arm64-tcwg-dev/Dockerfile
index c050086..46a7caf 100644
--- a/xenial-arm64-tcwg-dev/Dockerfile
+++ b/xenial-arm64-tcwg-dev/Dockerfile
@@ -94,7 +94,7 @@ RUN apt-get update \
RUN mkdir -p /var/run/sshd \
&& sed -i -e '/.*AuthorizedKeysFile/ d' /etc/ssh/sshd_config \
- && echo "AuthorizedKeysFile %h/.ssh/authorized_keys.dev" >> /etc/ssh/sshd_config \
+ && echo "AuthorizedKeysFile %h/.ssh/authorized_keys.docker" >> /etc/ssh/sshd_config \
&& locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 \
&& apt-file update
diff --git a/xenial-arm64-tcwg-dev/build.sh b/xenial-arm64-tcwg-dev/build.sh
index 68f06d9..40e5950 100755
--- a/xenial-arm64-tcwg-dev/build.sh
+++ b/xenial-arm64-tcwg-dev/build.sh
@@ -10,5 +10,8 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
-docker build --pull --tag=maximkuvyrkov/$(basename ${PWD}) .
+docker build --pull --tag=linaro/dev-${arch}-${name}-ubuntu:${distro} .
diff --git a/xenial-arm64-tcwg-dev/run.sh b/xenial-arm64-tcwg-dev/run.sh
index d2cbc0b..ed6a9b5 100755
--- a/xenial-arm64-tcwg-dev/run.sh
+++ b/xenial-arm64-tcwg-dev/run.sh
@@ -22,10 +22,10 @@ if ! [ -f /etc/sudoers.d/user ]; then
groupadd -g "$gid" "$groupname"
useradd -m -u "$uid" -g "$groupname" -c "$comment" -s "$shell" "$username"
- if ! [ -f /home/$username/.ssh/authorized_keys.x2go ] \
+ if ! [ -f /home/$username/.ssh/authorized_keys.docker ] \
&& [ x"$pubkey" != x"" ]; then
sudo -u $username mkdir -p /home/$username/.ssh/
- echo "$pubkey" | sudo -u $username tee /home/$username/.ssh/authorized_keys.dev > /dev/null
+ echo "$pubkey" | sudo -u $username tee /home/$username/.ssh/authorized_keys.docker > /dev/null
fi
echo "$username ALL = NOPASSWD: ALL" > /etc/sudoers.d/user
diff --git a/xenial-arm64-tcwg-dev/start.sh b/xenial-arm64-tcwg-dev/start.sh
index 70ebbaa..fc621d1 100755
--- a/xenial-arm64-tcwg-dev/start.sh
+++ b/xenial-arm64-tcwg-dev/start.sh
@@ -15,8 +15,8 @@ else
DOCKER="sudo docker"
fi
-$DOCKER pull maximkuvyrkov/xenial-arm64-tcwg-dev
-$DOCKER run --name=$USER-xenial -dt -p 22 -v $HOME:$HOME -v /home/tcwg-buildslave:/home/tcwg-buildslave:ro --memory=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G --pids-limit=5000 --cap-add=IPC_LOCK maximkuvyrkov/xenial-arm64-tcwg-dev "$(getent passwd $USER)" "$(id -gn)" "$(/etc/ssh/ssh_keys.py $USER 2>/dev/null || sss_ssh_authorizedkeys $USER 2>/dev/null)"
+$DOCKER pull linaro/dev-arm64-tcwg-dev-ubuntu:xenial
+$DOCKER run --name=$USER-xenial -dt -p 22 -v $HOME:$HOME -v /home/tcwg-buildslave:/home/tcwg-buildslave:ro --memory=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G --pids-limit=5000 --cap-add=IPC_LOCK linaro/dev-arm64-tcwg-dev-ubuntu:xenial "$(getent passwd $USER)" "$(id -gn)" "$(/etc/ssh/ssh_keys.py $USER 2>/dev/null || sss_ssh_authorizedkeys $USER 2>/dev/null)"
port=$($DOCKER port $USER-xenial 22 | cut -d: -f 2)