diff --git a/opennebula-docker/Dockerfile_0.2.8 b/opennebula-docker/Dockerfile_0.2.8 deleted file mode 100644 index a7ee4d7..0000000 --- a/opennebula-docker/Dockerfile_0.2.8 +++ /dev/null @@ -1,16 +0,0 @@ -FROM debian:trixie - -COPY opennebula-virsh /etc/sudoers.d -COPY entrypoint.sh / - -RUN apt-get update -RUN apt-get install -y gnupg2 openssh-server strace sudo wget ceph-common -RUN wget -q -O- https://downloads.opennebula.io/repo/repo2.key | gpg --dearmor --yes --output /etc/apt/keyrings/opennebula.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/opennebula.gpg] https://downloads.opennebula.io/repo/7.1/Debian/13 stable opennebula" > /etc/apt/sources.list.d/opennebula.list -RUN apt-get update && apt-get install -y --no-install-recommends opennebula-node-kvm - -RUN mv /usr/bin/virsh /usr/bin/virsh.orig -COPY virsh /usr/bin/virsh -RUN chmod a+rx /usr/bin/virsh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/opennebula-docker/Dockerfile_0.2.8 b/opennebula-docker/Dockerfile_0.2.8 new file mode 120000 index 0000000..94aaeb3 --- /dev/null +++ b/opennebula-docker/Dockerfile_0.2.8 @@ -0,0 +1 @@ +Dockerfile_0.2.2 \ No newline at end of file diff --git a/opennebula-docker/Dockerfile_0.2.8~HEAD b/opennebula-docker/Dockerfile_0.2.8~HEAD new file mode 100644 index 0000000..a7ee4d7 --- /dev/null +++ b/opennebula-docker/Dockerfile_0.2.8~HEAD @@ -0,0 +1,16 @@ +FROM debian:trixie + +COPY opennebula-virsh /etc/sudoers.d +COPY entrypoint.sh / + +RUN apt-get update +RUN apt-get install -y gnupg2 openssh-server strace sudo wget ceph-common +RUN wget -q -O- https://downloads.opennebula.io/repo/repo2.key | gpg --dearmor --yes --output /etc/apt/keyrings/opennebula.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/opennebula.gpg] https://downloads.opennebula.io/repo/7.1/Debian/13 stable opennebula" > /etc/apt/sources.list.d/opennebula.list +RUN apt-get update && apt-get install -y --no-install-recommends opennebula-node-kvm + +RUN mv /usr/bin/virsh /usr/bin/virsh.orig +COPY virsh /usr/bin/virsh +RUN chmod a+rx /usr/bin/virsh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/opennebula-docker/Dockerfile_0.2.9 b/opennebula-docker/Dockerfile_0.2.9 deleted file mode 100644 index 86bbfe9..0000000 --- a/opennebula-docker/Dockerfile_0.2.9 +++ /dev/null @@ -1,17 +0,0 @@ -FROM debian:trixie - - -RUN apt-get update -RUN apt-get install -y gnupg2 openssh-server strace sudo wget ceph-common -RUN wget -q -O- https://downloads.opennebula.io/repo/repo2.key | gpg --dearmor --yes --output /etc/apt/keyrings/opennebula.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/opennebula.gpg] https://downloads.opennebula.io/repo/7.1/Debian/13 stable opennebula" > /etc/apt/sources.list.d/opennebula.list -RUN apt-get update && apt-get install -y --no-install-recommends opennebula-node-kvm - -RUN mv /usr/bin/virsh /usr/bin/virsh.orig -COPY virsh /usr/bin/virsh -RUN chmod a+rx /usr/bin/virsh - -COPY opennebula-virsh /etc/sudoers.d -COPY entrypoint.sh / - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/opennebula-docker/Dockerfile_0.2.9 b/opennebula-docker/Dockerfile_0.2.9 new file mode 120000 index 0000000..94aaeb3 --- /dev/null +++ b/opennebula-docker/Dockerfile_0.2.9 @@ -0,0 +1 @@ +Dockerfile_0.2.2 \ No newline at end of file diff --git a/opennebula-docker/Dockerfile_0.2.9~HEAD b/opennebula-docker/Dockerfile_0.2.9~HEAD new file mode 100644 index 0000000..86bbfe9 --- /dev/null +++ b/opennebula-docker/Dockerfile_0.2.9~HEAD @@ -0,0 +1,17 @@ +FROM debian:trixie + + +RUN apt-get update +RUN apt-get install -y gnupg2 openssh-server strace sudo wget ceph-common +RUN wget -q -O- https://downloads.opennebula.io/repo/repo2.key | gpg --dearmor --yes --output /etc/apt/keyrings/opennebula.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/opennebula.gpg] https://downloads.opennebula.io/repo/7.1/Debian/13 stable opennebula" > /etc/apt/sources.list.d/opennebula.list +RUN apt-get update && apt-get install -y --no-install-recommends opennebula-node-kvm + +RUN mv /usr/bin/virsh /usr/bin/virsh.orig +COPY virsh /usr/bin/virsh +RUN chmod a+rx /usr/bin/virsh + +COPY opennebula-virsh /etc/sudoers.d +COPY entrypoint.sh / + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/opennebula-docker/README.org b/opennebula-docker/README.org index 60ca96a..393ebd5 100644 --- a/opennebula-docker/README.org +++ b/opennebula-docker/README.org @@ -1,7 +1,10 @@ -* 0.2.9, 2026-06-15 +* 0.4.0, 2026-08-19 + - Fix /etc/hosts update for ceph +* 0.3.0, 2026-06-15 - Add sudoers file after install packages (it was not present in the image) -* 0.2.8, 2026-06-15 +* 0.2.8, 2026-06-15, 2026-06-03 - Fix execute permission error on /usr/bin/virsh + - SSHD stderr logging * 0.2.7, 2026-05-30 - Adjust SSHD port * 0.2.6, 2026-05-30 diff --git a/opennebula-docker/entrypoint.sh b/opennebula-docker/entrypoint.sh index 2f876ca..5d23367 100755 --- a/opennebula-docker/entrypoint.sh +++ b/opennebula-docker/entrypoint.sh @@ -12,7 +12,7 @@ fi # Patch SSHD port to avoid conflicts echo Port 2222 >> /etc/ssh/sshd_config -/etc/init.d/ssh start +/usr/sbin/sshd -e # Setup libvirtd secret if [ -z "$SKIP_LIBVIRTD" -a -e /ceph-secret/uuid ]; then @@ -51,6 +51,7 @@ while true; do echo $ip rook-ceph-$i >> /tmp/hosts i=$((i+1)) done < /tmp/ceph-mon-ips + mv /tmp/hosts /etc/hosts ###################################################################### # /etc/ceph/ceph.conf