
* Revert "work around an issue with docker/dockerhub (#10547)"
This reverts commit 0ef139ac4d
.
* Add more docker base image configurations.
- Renamed configs
- "centos" -> "centos-7"
- "fedora" -> "fedora-24"
- "opensuse" -> "opensuse-tumbleweed"
- "scilinux" -> "scilinux-7"
- "ubuntu" -> "ubuntu-1804"
- Added configs
- "centos-6"
- "fedora-29"
- "opensuse-leap"
- "scilinux-6"
- "ubuntu-1604"
With these changes, our docker hub image
collection will consist of the following:
- "spack/archlinux"
- "latest"
- "spack/centos"
- "latest", "centos7", "7"
- "centos6", "6"
- "spack/fedora"
- "latest", "29"
- "24"
- "spack/opensuse"
- "latest", "tumbleweed"
- "leap"
- "spack/scilinux"
- "latest", "7"
- "6"
- "spack/ubuntu"
- "latest", "bionic", "18.04"
- "xenial", "16.04"
51 lines
1.5 KiB
Bash
51 lines
1.5 KiB
Bash
# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
|
|
# Spack Project Developers. See the top-level COPYRIGHT file for details.
|
|
#
|
|
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
|
|
|
if [ "$CURRENTLY_BUILDING_DOCKER_IMAGE" '!=' '1' ] ; then
|
|
|
|
uid="`id -u`"
|
|
if [ "$uid" '=' '0' ] ; then
|
|
key_types="dsa ecdsa rsa"
|
|
if [ "$DOCKERFILE_BASE" '!=' 'centos:6' ] ; then
|
|
key_types="${key_types} ed25519"
|
|
fi
|
|
|
|
for key_type in $key_types ; do
|
|
private_key_file="/etc/ssh/ssh_host_${key_type}_key"
|
|
public_key_file="$private_key_file.pub"
|
|
|
|
if [ '!' -f "$private_key_file" ] ; then
|
|
ssh-keygen \
|
|
-q -t "$key_type" -N "" -f "$private_key_file"
|
|
chmod 600 "$private_key_file"
|
|
chmod 644 "$public_key_file"
|
|
fi
|
|
done
|
|
|
|
mkdir -p /var/run/sshd
|
|
|
|
pgrep -u 0 -U 0 sshd &> /dev/null
|
|
if [ '!' "$?" '=' '0' ] ; then
|
|
nohup /usr/sbin/sshd -f /etc/ssh/sshd_config < /dev/null &> /dev/null
|
|
fi
|
|
fi
|
|
|
|
if [ '!' -f "$HOME/.ssh/id_rsa" ] ; then
|
|
ssh-keygen \
|
|
-t rsa -C "spack.developer@docker.host" -N "" -f "$HOME/.ssh/id_rsa"
|
|
cat "$HOME/.ssh/id_rsa.pub" >> "$HOME/.ssh/authorized_keys"
|
|
chmod 600 "$HOME/.ssh/authorized_keys"
|
|
|
|
docker_ip="`ip address show dev eth0 |
|
|
grep inet |
|
|
cut -d' ' -f 6 |
|
|
cut -d/ -f 1`"
|
|
|
|
ssh-keyscan -t rsa 127.0.0.1 localhost "$docker_ip" "`hostname`" \
|
|
> "$HOME/.ssh/known_hosts" 2> /dev/null
|
|
fi
|
|
|
|
fi # [ "$CURRENTLY_BUILDING_DOCKER_IMAGE" '!=' '1' ]
|