diff --git a/machine/generic-x86-64 b/machine/generic-x86-64 index 389809c6d8e..874f0aecc10 100644 --- a/machine/generic-x86-64 +++ b/machine/generic-x86-64 @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ libva-intel-driver diff --git a/machine/intel-nuc b/machine/intel-nuc index ebf174105c4..750b49727be 100644 --- a/machine/intel-nuc +++ b/machine/intel-nuc @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM # NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply # changes in generic-x86-64 as well. diff --git a/machine/khadas-vim3 b/machine/khadas-vim3 index 3194c092d54..c1d74d3528e 100644 --- a/machine/khadas-vim3 +++ b/machine/khadas-vim3 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/odroid-c2 b/machine/odroid-c2 index 3194c092d54..c1d74d3528e 100644 --- a/machine/odroid-c2 +++ b/machine/odroid-c2 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/odroid-c4 b/machine/odroid-c4 index 3194c092d54..c1d74d3528e 100644 --- a/machine/odroid-c4 +++ b/machine/odroid-c4 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/odroid-m1 b/machine/odroid-m1 index 3194c092d54..c1d74d3528e 100644 --- a/machine/odroid-m1 +++ b/machine/odroid-m1 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/odroid-n2 b/machine/odroid-n2 index 3194c092d54..c1d74d3528e 100644 --- a/machine/odroid-n2 +++ b/machine/odroid-n2 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/odroid-xu b/machine/odroid-xu index 3194c092d54..c1d74d3528e 100644 --- a/machine/odroid-xu +++ b/machine/odroid-xu @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/qemuarm b/machine/qemuarm index 3194c092d54..c1d74d3528e 100644 --- a/machine/qemuarm +++ b/machine/qemuarm @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/qemuarm-64 b/machine/qemuarm-64 index 3194c092d54..c1d74d3528e 100644 --- a/machine/qemuarm-64 +++ b/machine/qemuarm-64 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/qemux86 b/machine/qemux86 index 3194c092d54..c1d74d3528e 100644 --- a/machine/qemux86 +++ b/machine/qemux86 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/qemux86-64 b/machine/qemux86-64 index 3194c092d54..c1d74d3528e 100644 --- a/machine/qemux86-64 +++ b/machine/qemux86-64 @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/raspberrypi b/machine/raspberrypi index d3b88f9a8ff..3cce504661e 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \ diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index 3da2d3c6a43..c49db40b408 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \ diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index 3da2d3c6a43..c49db40b408 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \ diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64 index 3da2d3c6a43..c49db40b408 100644 --- a/machine/raspberrypi3-64 +++ b/machine/raspberrypi3-64 @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \ diff --git a/machine/raspberrypi4 b/machine/raspberrypi4 index 3da2d3c6a43..c49db40b408 100644 --- a/machine/raspberrypi4 +++ b/machine/raspberrypi4 @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \ diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64 index 3da2d3c6a43..c49db40b408 100644 --- a/machine/raspberrypi4-64 +++ b/machine/raspberrypi4-64 @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \ diff --git a/machine/tinker b/machine/tinker index 3194c092d54..c1d74d3528e 100644 --- a/machine/tinker +++ b/machine/tinker @@ -1,5 +1,4 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM diff --git a/machine/yellow b/machine/yellow index 3da2d3c6a43..c49db40b408 100644 --- a/machine/yellow +++ b/machine/yellow @@ -1,8 +1,7 @@ ARG \ - BUILD_FROM \ - BUILD_VERSION + BUILD_FROM -FROM $BUILD_FROM:$BUILD_VERSION +FROM $BUILD_FROM RUN apk --no-cache add \ raspberrypi \