From 002211c0355453713e4dda1737628bea046d95c6 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 19 Oct 2022 15:49:48 +0100 Subject: [PATCH] optimise --- .github/dependabot.yml | 25 ++++++++++++------------- Dockerfile.ubuntu-1804 | 31 ++++++++++++++++++------------- Dockerfile.ubuntu-2004 | 32 +++++++++++++++++++------------- Dockerfile.ubuntu-2204 | 34 +++++++++++++++++++++------------- 4 files changed, 70 insertions(+), 52 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2cd22b7..9c2831b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,15 +1,14 @@ # Set update schedule for GitHub Actions -- name: Dependabot - version: 2 - updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" - - package-ecosystem: "docker" - # Look for a `Dockerfile` in the `root` directory - directory: "/" - # Check for updates once a week - schedule: - interval: "weekly" + - package-ecosystem: "docker" + # Look for a `Dockerfile` in the `root` directory + directory: "/" + # Check for updates once a week + schedule: + interval: "weekly" diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804 index 7e49549..c6bc3b0 100644 --- a/Dockerfile.ubuntu-1804 +++ b/Dockerfile.ubuntu-1804 @@ -4,8 +4,13 @@ LABEL maintainer="LinuxGSM " # Install UTF-8 unicode RUN echo "**** Install UTF-8 ****" \ - && apt-get update \ - && apt-get install -y locales apt-utils debconf-utils ca-certificates + && apt-get update \ + && apt-get install -y locales apt-utils debconf-utils ca-certificates \ + && apt-get -y autoremove \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + && rm -rf /var/tmp/* RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 # Add unicode support @@ -15,17 +20,17 @@ ENV LANGUAGE 'en_US:en' # Install SteamCMD RUN echo "**** Install SteamCMD ****" \ -&& echo steam steam/question select "I AGREE" | debconf-set-selections \ -&& echo steam steam/license note '' | debconf-set-selections \ -&& dpkg --add-architecture i386 \ -&& apt-get update \ -&& apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \ -&& ln -s /usr/games/steamcmd /usr/bin/steamcmd \ -&& apt-get -y autoremove \ -&& apt-get -y clean \ -&& rm -rf /var/lib/apt/lists/* \ -&& rm -rf /tmp/* \ -&& rm -rf /var/tmp/* + && echo steam steam/question select "I AGREE" | debconf-set-selections \ + && echo steam steam/license note '' | debconf-set-selections \ + && dpkg --add-architecture i386 \ + && apt-get update \ + && apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \ + && ln -s /usr/games/steamcmd /usr/bin/steamcmd \ + && apt-get -y autoremove \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + && rm -rf /var/tmp/* # Update SteamCMD RUN steamcmd +quit diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index 07c2655..acf87c0 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -4,8 +4,13 @@ LABEL maintainer="LinuxGSM " # Install UTF-8 unicode RUN echo "**** Install UTF-8 ****" \ - && apt-get update \ - && apt-get install -y locales apt-utils debconf-utils ca-certificates + && apt-get update \ + && apt-get install -y locales apt-utils debconf-utils ca-certificates \ + && apt-get -y autoremove \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + && rm -rf /var/tmp/* RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 # Add unicode support @@ -15,17 +20,18 @@ ENV LANGUAGE 'en_US:en' # Install SteamCMD RUN echo "**** Install SteamCMD ****" \ -&& echo steam steam/question select "I AGREE" | debconf-set-selections \ -&& echo steam steam/license note '' | debconf-set-selections \ -&& dpkg --add-architecture i386 \ -&& apt-get update \ -&& apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \ -&& ln -s /usr/games/steamcmd /usr/bin/steamcmd \ -&& apt-get -y autoremove \ -&& apt-get -y clean \ -&& rm -rf /var/lib/apt/lists/* \ -&& rm -rf /tmp/* \ -&& rm -rf /var/tmp/* + && echo steam steam/question select "I AGREE" | debconf-set-selections \ + && echo steam steam/license note '' | debconf-set-selections \ + && dpkg --add-architecture i386 \ + && apt-get update \ + && apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \ + && ln -s /usr/games/steamcmd /usr/bin/steamcmd \ + && apt-get -y autoremove \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + && rm -rf /var/tmp/* # Update SteamCMD RUN steamcmd +quit + diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index 4d4166b..f57d230 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -2,10 +2,17 @@ FROM ubuntu:22.04 LABEL maintainer="LinuxGSM " +LABEL maintainer="LinuxGSM " + # Install UTF-8 unicode RUN echo "**** Install UTF-8 ****" \ - && apt-get update \ - && apt-get install -y locales apt-utils debconf-utils ca-certificates + && apt-get update \ + && apt-get install -y locales apt-utils debconf-utils ca-certificates \ + && apt-get -y autoremove \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + && rm -rf /var/tmp/* RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 # Add unicode support @@ -15,17 +22,18 @@ ENV LANGUAGE 'en_US:en' # Install SteamCMD RUN echo "**** Install SteamCMD ****" \ -&& echo steam steam/question select "I AGREE" | debconf-set-selections \ -&& echo steam steam/license note '' | debconf-set-selections \ -&& dpkg --add-architecture i386 \ -&& apt-get update \ -&& apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \ -&& ln -s /usr/games/steamcmd /usr/bin/steamcmd \ -&& apt-get -y autoremove \ -&& apt-get -y clean \ -&& rm -rf /var/lib/apt/lists/* \ -&& rm -rf /tmp/* \ -&& rm -rf /var/tmp/* + && echo steam steam/question select "I AGREE" | debconf-set-selections \ + && echo steam steam/license note '' | debconf-set-selections \ + && dpkg --add-architecture i386 \ + && apt-get update \ + && apt-get install -y --no-install-recommends libsdl2-2.0-0:i386 locales steamcmd \ + && ln -s /usr/games/steamcmd /usr/bin/steamcmd \ + && apt-get -y autoremove \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + && rm -rf /var/tmp/* # Update SteamCMD RUN steamcmd +quit +