diff --git a/build-factario-container.jenkins b/build-factario-container.jenkins index 8f7ec66..24cad02 100644 --- a/build-factario-container.jenkins +++ b/build-factario-container.jenkins @@ -8,6 +8,10 @@ def AlpineGlibcBasePackageFilename = "glibc-${AlpineGlibcPackageVersion}.apk" def AlpineGlibcBinPackageFilename = "glibc-${AlpineGlibcPackageVersion}.apk" def AlpineGlibcI18nPackageFilename = "glibc-${AlpineGlibcPackageVersion}.apk" +def GlibcLanguage = "C.UTF-8" + +def TimeZone = "America/Chicago" + def FactorioDownloadURL = "https://www.factorio.com/get-download/stable/headless/linux64" def FactorioFileName = "/tmp/factorio.tar" @@ -44,7 +48,8 @@ RUN \ "${AlpineGlibcBinPackageFilename}" \ "${AlpineGlibcI18nPackageFilename}" && \ rm -v "/etc/apk/keys/sgerrand.rsa.pub" && \ - /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true && \ + /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "${GlibcLanguage}" || true && \ + printf '%s\n' "export LANG=${GlibcLanguage}" "export TZ=${TimeZone}" >> /etc/profile.d/locale.sh && \ mkdir -p /opt /factorio && \ curl -sSL "${FactorioDownloadURL}" -o ${FactorioFileName} && \ tar -x -f ${FactorioFileName} --directory /opt && \ @@ -55,7 +60,6 @@ RUN \ "${AlpineGlibcBinPackageFilename}" \ "${AlpineGlibcI18nPackageFilename}" \ ${FactorioFileName} && \ - rm -v "/root/.wget-hsts" || true && \ addgroup -g 1000 -S factorio && \ adduser -u 1000 -G factorio -s /bin/sh -SDH factorio && \ chown -R factorio:factorio /opt/factorio /factorio