linka-cloud/d2vm
2
0
Fork 0
mirror of https://github.com/linka-cloud/d2vm.git synced 2024-11-21 23:36:25 +00:00
Code Issues Releases Activity

add ubuntu 16.04 support

Browse Source 
Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
Adphi 2024-08-23 14:57:10 +02:00 committed by Adphi
parent e31bc93074
commit d8ee37833e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockerfile.go
View File

@ -91,7 +91,11 @@ func NewDockerfile(release OSRelease, img, password string, networkManager Netwo
net = NetworkManagerIfupdown2 net = NetworkManagerIfupdown2
case ReleaseUbuntu: case ReleaseUbuntu:
d.tmpl = ubuntuDockerfileTemplate d.tmpl = ubuntuDockerfileTemplate
net = NetworkManagerNetplan if release.VersionID < "18.04" {
net = NetworkManagerIfupdown2
} else {
net = NetworkManagerNetplan
}
case ReleaseAlpine: case ReleaseAlpine:
d.tmpl = alpineDockerfileTemplate d.tmpl = alpineDockerfileTemplate
net = NetworkManagerIfupdown2 net = NetworkManagerIfupdown2

2
templates/ubuntu.Dockerfile
View File

@ -25,7 +25,9 @@ RUN ARCH="$([ "$(uname -m)" = "x86_64" ] && echo amd64 || echo arm64)"; \
iputils-ping && \ iputils-ping && \
find /boot -type l -exec rm {} \; find /boot -type l -exec rm {} \;
{{ if gt .Release.VersionID "16.04" }}
RUN systemctl preset-all RUN systemctl preset-all
{{ end }}
{{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }} {{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }}