diff --git a/README.md b/README.md index ddfe5be..e5573ec 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,24 @@ Initial work taken from [comfy](https://github.com/Misenko/comfy) ## Building the images +### Requirements + +From a base Ubuntu 22.04, you can get a working building environment by installing +`packer`, `ansible`, `qemu`, `jq` and `virtualbox`, e.g.: + +```shell +# get up to date system +$ sudo apt-get update && sudo apt-get upgrade -y +# Install packer +$ curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - +$ sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" +$ sudo apt-get update && sudo apt-get install -y packer +# Install other tools +$ sudo apt-get install -y ansible qemu-system-x86 qemu-utils jq virtualbox +``` + +### Building + There is a `tools/build.sh` script that can be used to build image and convert to OVA in one go. The script will create a temporary ssh key that's used by packer to connect to the VM as root (or privileged user). diff --git a/ubuntu/appdb/docker.yaml b/ubuntu/appdb/docker.yaml index 7e7195e..a144427 100644 --- a/ubuntu/appdb/docker.yaml +++ b/ubuntu/appdb/docker.yaml @@ -1,11 +1,12 @@ --- appdb: - version: 2023.03.15 + version: 2023.09.19 expireson: 6 notes: | - Upgrade base image to Ubuntu 22.04 - url: https://api.cloud.ifca.es:8080/swift/v1/egi_endorsed_vas/Docker.Ubuntu.22.04-2023.03.15.ova - sha512: "22e97c49d6a1dde8f4d0cb4f697130fe7e52441a618bc3b5d2abbf6689f119669eaacbbf6685a30fc8accc00712947930dcb5d660ce43c212b1a6f0e320ef8a8" + Upgrade to docker 24.0.6 and docker-compose 2.21.0 + Upgrade base image to Ubuntu 22.04.3 + url: https://api.cloud.ifca.es:8080/swift/v1/egi_endorsed_vas/Docker.Ubuntu.22.04-2023.09.19.ova + sha512: "5e538ba0792e8e9d54da5645c018c87ef8bab26cb6ed4c864d735181ae52cdac1c9db5f088197434e6923f224f701ddb2f7c723388e02b032de4716d89390671" arch: x86_64 os: family: Linux diff --git a/ubuntu/docker-ubuntu-22.04.json b/ubuntu/docker-ubuntu-22.04.json index e7d81b4..e4c3fbe 100644 --- a/ubuntu/docker-ubuntu-22.04.json +++ b/ubuntu/docker-ubuntu-22.04.json @@ -22,8 +22,8 @@ "http_directory": "httpdir", "http_port_max": 8550, "http_port_min": 8500, - "iso_url": "https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso", - "iso_checksum": "sha256:10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb", + "iso_url": "https://releases.ubuntu.com/22.04/ubuntu-22.04.3-live-server-amd64.iso", + "iso_checksum": "sha256:a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd", "memory": 1024, "ssh_timeout": "20m", "ssh_clear_authorized_keys": true, @@ -31,10 +31,12 @@ "shutdown_command": "sudo -- sh -c 'rm /etc/sudoers.d/99-egi-installation && shutdown -h now'", "ssh_username": "ubuntu", "type": "qemu", + "vnc_port_min": 5934, + "vnc_port_max": 5934, "qemuargs": [ [ "-cpu", "host" ] ], - "vm_name": "Docker.Ubuntu.22.04-2023.03.15" + "vm_name": "Docker.Ubuntu.22.04-2023.09.19" } ], "provisioners": [ diff --git a/ubuntu/httpdir/user-data b/ubuntu/httpdir/user-data index 63b8a0e..276adc0 100644 --- a/ubuntu/httpdir/user-data +++ b/ubuntu/httpdir/user-data @@ -5,8 +5,8 @@ autoinstall: version: 1 locale: en_US keyboard: - layout: en - variant: us + layout: us + variant: "" identity: hostname: egi username: ubuntu diff --git a/ubuntu/provisioners/roles/docker/tasks/main.yaml b/ubuntu/provisioners/roles/docker/tasks/main.yaml index 04b62b6..5d01792 100644 --- a/ubuntu/provisioners/roles/docker/tasks/main.yaml +++ b/ubuntu/provisioners/roles/docker/tasks/main.yaml @@ -9,8 +9,8 @@ include_role: name: grycap.docker vars: - docker_version: "5:20.10.18~3-0~{{ansible_distribution | lower}}-{{ansible_distribution_release}}" - docker_compose_version: "v2.10.2" + docker_version: "5:24.0.6-1~ubuntu.22.04~jammy" + docker_compose_version: "v2.21.0" docker_install_pip: false docker_config_values: exec-opts: