Переглянути джерело

Do a bit of dockerfile mongling to fix bad hits to mirrors

George S. Baugh 4 роки тому
батько
коміт
c6cdc45bfb
2 змінених файлів з 5 додано та 13 видалено
  1. 3 12
      Dockerfile.build
  2. 2 1
      Makefile

+ 3 - 12
Dockerfile.build

@@ -2,8 +2,6 @@ FROM ubuntu:21.04 AS base
 
 USER root
 RUN useradd tcms
-RUN apt-get update
-RUN apt-get install -y make apt-utils mlocate curl
 
 ADD ./Makefile /home/tcms/Makefile
 ADD ./Makefile.PL /home/tcms/Makefile.PL
@@ -13,14 +11,7 @@ RUN chown -R tcms /home/tcms
 
 WORKDIR /home/tcms
 
-RUN apt-get install -y locales
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-ENV LANG en_US.utf8
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
-RUN apt-get install -y tzdata
-RUN dpkg-reconfigure --frontend noninteractive tzdata
-
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y make
 RUN make prereq-debian
-RUN updatedb

+ 2 - 1
Makefile

@@ -26,11 +26,12 @@ prereq-debian: prereq-debs prereq-perl prereq-frontend
 
 .PHONY: prereq-debs
 prereq-debs:
+	apt-get update
 	apt-get install -y sqlite3 libsqlite3-dev libdbd-sqlite3-perl cpanminus starman libxml2 curl                         \
 	    libtext-xslate-perl libplack-perl libconfig-tiny-perl libdatetime-format-http-perl libjson-maybexs-perl          \
 	    libuuid-tiny-perl libcapture-tiny-perl libconfig-simple-perl libdbi-perl libfile-slurper-perl libfile-touch-perl \
 	    libfile-copy-recursive-perl libxml-rss-perl libmodule-install-perl libio-string-perl                             \
-	    libmoose-perl libmoosex-types-datetime-perl libxml-libxml-perl
+	    libmoose-perl libmoosex-types-datetime-perl libxml-libxml-perl curl
 
 .PHONY: prereq-perl
 prereq-perl: