From 872bb160d3977da2bfcd4f9243db946278c2f9df Mon Sep 17 00:00:00 2001 From: Ole Petter Date: Mon, 22 Aug 2022 12:43:20 +0200 Subject: [PATCH] chore: remove the Ubuntu 16.04 leftover workaround Ubuntu 20 is at version 1.45 of mke2fs, which should have the required functionality. Signed-off-by: Ole Petter --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0822d3c..abd7bd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,12 +63,6 @@ COPY --from=build /root/pxz/pxz /usr/bin/pxz RUN echo "Defaults secure_path=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:$PATH\"" > /etc/sudoers.d/secure_path_override RUN chmod 0440 /etc/sudoers.d/secure_path_override -# Turn off default filesystem feature which is supported in newer mke2fs tools, -# but not in Ubuntu 16.04. The result is that mender-artifact can not be used to -# modify the artifact. Once 16.04 goes out of support, this can probably be -# removed. -RUN sed -i -e 's/,metadata_csum//' /etc/mke2fs.conf - RUN wget -q -O /usr/bin/mender-artifact https://downloads.mender.io/mender-artifact/$MENDER_ARTIFACT_VERSION/linux/mender-artifact \ && chmod +x /usr/bin/mender-artifact