Skip to content

Commit 02e143c

Browse files
committed
Fix for Debian
1 parent c47ef2f commit 02e143c

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

cloud-init-user-data

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,23 @@
11
#cloud-config
22

3-
# users and groups
4-
#groups:
5-
# - docker
6-
3+
# users
74
users:
85
- default
96
- name: ${user}
107
sudo: ALL=(ALL) NOPASSWD:ALL
118
shell: /bin/zsh
129
groups: docker
1310

14-
disable_root: true
15-
1611
# packages
1712
package_update: true
1813
package_upgrade: true
1914

2015
packages:
2116
- curl
22-
- docker-ce
2317
- git
2418
- sudo
2519
- zsh
2620

27-
apt:
28-
preserve_sources_list: true
29-
sources:
30-
docker.list:
31-
source: "deb [arch=amd64] https://download.docker.com/linux/${distrib} ${codename} stable"
32-
keyid: 0EBFCD88
33-
3421
runcmd:
3522
# copy authorized SSH keys for the created user
3623
- 'mkdir -p /home/${user}/.ssh'
@@ -45,7 +32,16 @@ runcmd:
4532
- 'runuser -l ${user} -c "git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git /home/${user}/.oh-my-zsh"'
4633
- 'runuser -l ${user} -c "cp /home/${user}/.oh-my-zsh/templates/zshrc.zsh-template /home/${user}/.zshrc"'
4734
- 'sed -i "s/ZSH_THEME=\".*\"/ZSH_THEME=\"ys\"/" /home/${user}/.zshrc'
48-
35+
# install Docker
36+
- 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/${distrib} $(lsb_release -cs) stable"'
37+
- 'apt-get update'
38+
- 'apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common'
39+
- 'curl -fsSL https://download.docker.com/linux/${distrib}/gpg > /tmp/docker.gpg'
40+
- 'apt-key add /tmp/docker.gpg'
41+
- 'apt-get update'
42+
- 'apt-get install -y docker-ce'
43+
44+
#
4945
power_state:
5046
delay: "+1"
5147
timeout: 0

main.tf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ resource "scaleway_server" "node" {
1818
# initialization sequence
1919
cloudinit = "${data.template_file.userdata.rendered}"
2020
provisioner "remote-exec" {
21-
inline = ["while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'waiting for cloud-init initialization'; sleep 10; done;"]
21+
inline = [
22+
"tail -f /var/log/cloud-init-output.log &",
23+
"while [ ! -f /var/lib/cloud/instance/boot-finished ]; do sleep 10; done;"
24+
]
2225
}
2326
provisioner "local-exec" {
2427
command = "sleep 80" # wait more than 1 minute for the instance to be rebooted

0 commit comments

Comments
 (0)