Merge pull request #7 from csmart/fix_package_updating
fix: disable Dockerfile always check for package updates
diff --git a/build-setup.sh b/build-setup.sh
index 86891a9..ca51041 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -48,9 +48,28 @@
${PROXY}
-RUN dnf --refresh upgrade -y
-RUN dnf install -y git subversion gcc gcc-c++ make perl-Thread-Queue perl-Data-Dumper diffstat texinfo \
-chrpath wget SDL-devel patch bzip2 tar cpio findutils socat which python-devel perl-bignum
+RUN dnf --refresh install -y \
+ bzip2 \
+ chrpath \
+ cpio \
+ diffstat \
+ findutils \
+ gcc \
+ gcc-c++ \
+ git \
+ make \
+ patch \
+ perl-bignum \
+ perl-Data-Dumper \
+ perl-Thread-Queue \
+ python-devel \
+ SDL-devel \
+ socat \
+ subversion \
+ tar \
+ texinfo \
+ wget \
+ which
RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
@@ -71,16 +90,26 @@
${PROXY}
-#RUN echo $(date +%s) && apt-get update
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git subversion diffstat texinfo \
- chrpath wget libthread-queue-any-perl libdata-dumper-simple-perl python libsdl1.2-dev gawk socat debianutils
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -yy \
+ build-essential \
+ chrpath \
+ debianutils \
+ diffstat \
+ gawk \
+ git \
+ libdata-dumper-simple-perl \
+ libsdl1.2-dev \
+ libthread-queue-any-perl \
+ python \
+ socat \
+ subversion \
+ texinfo \
+ wget
RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
-
USER ${USER}
ENV HOME ${HOME}
RUN /bin/bash
diff --git a/initramfs-build.sh b/initramfs-build.sh
index 3ea2e08..3c08807 100755
--- a/initramfs-build.sh
+++ b/initramfs-build.sh
@@ -23,11 +23,19 @@
${PROXY}
-#RUN echo $(date +%s) && apt-get update
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -yy
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy bc build-essential cpio git python unzip wget
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -yy \
+ bc \
+ build-essential \
+ cpio \
+ git \
+ python \
+ unzip \
+ wget
+
+RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+
RUN locale-gen en_AU.utf8
USER ${USER}
diff --git a/kernel-build-setup.sh b/kernel-build-setup.sh
index de3253f..89c2d2f 100755
--- a/kernel-build-setup.sh
+++ b/kernel-build-setup.sh
@@ -29,9 +29,18 @@
${PROXY}
-RUN dnf --refresh upgrade -y
-RUN dnf install -y bc findutils git gcc gcc-arm-linux-gnu hostname make uboot-tools xz
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+RUN dnf --refresh install -y \
+ bc \
+ findutils \
+ git \
+ gcc \
+ gcc-arm-linux-gnu \
+ hostname \
+ make \
+ uboot-tools xz
+
+RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
USER ${USER}
ENV HOME ${HOME}
@@ -49,10 +58,16 @@
${PROXY}
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -yy
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy bc build-essential git gcc-arm-none-eabi u-boot-tools
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -yy \
+ bc \
+ build-essential \
+ git \
+ gcc-arm-none-eabi \
+ u-boot-tools
+
+RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
USER ${USER}
ENV HOME ${HOME}
diff --git a/kernel-build.sh b/kernel-build.sh
index af2bec0..d1a52f2 100755
--- a/kernel-build.sh
+++ b/kernel-build.sh
@@ -23,17 +23,20 @@
${PROXY}
-# If we need to fetch new apt repo data, update the timestamp
-RUN echo 201603031716 && apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -yy
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy bc build-essential git gcc-powerpc64le-linux-gnu
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy software-properties-common
-RUN apt-add-repository -y multiverse
-# If we need to fetch new apt repo data, update the timestamp
-RUN echo 201603031716 && apt-get update
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy dwarves sparse
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -yy \
+ bc \
+ build-essential \
+ git \
+ gcc-powerpc64le-linux-gnu \
+ software-properties-common
+
+RUN apt-add-repository -y multiverse && apt-get update && apt-get install -yy \
+ dwarves \
+ sparse
+
+RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
USER ${USER}
ENV HOME ${HOME}
diff --git a/openpower-build-setup.sh b/openpower-build-setup.sh
index 1c771aa..774cc53 100755
--- a/openpower-build-setup.sh
+++ b/openpower-build-setup.sh
@@ -25,10 +25,42 @@
Dockerfile=$(cat << EOF
FROM fedora:latest
-RUN dnf --refresh upgrade -y && \
- dnf install -y vim gcc-c++ flex bison git ctags cscope expat-devel \
- patch zlib-devel zlib-static perl
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+RUN dnf --refresh repolist && dnf install -y \
+ bc \
+ bison \
+ bzip2 \
+ cpio \
+ cscope \
+ ctags \
+ expat-devel \
+ findutils \
+ flex \
+ gcc-c++ \
+ git \
+ libxml2-devel \
+ ncurses-devel \
+ patch \
+ perl \
+ perl-bignum \
+ "perl(Digest::SHA1)" \
+ perl(Env)" \
+ "perl(Fatal)" \
+ "perl(Thread::Queue)" \
+ "perl(XML::SAX)" \
+ "perl(XML::Simple)" \
+ "perl(YAML)" \
+ "perl(XML::LibXML)" \
+ python \
+ tar \
+ unzip \
+ vim \
+ wget \
+ which \
+ zlib-devel \
+ zlib-static
+
+RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
USER ${USER}
ENV HOME ${HOME}
@@ -42,13 +74,32 @@
FROM ubuntu:15.10
ENV DEBIAN_FRONTEND noninteractive
-RUN echo $(date +%s) && apt-get update && \
- apt-get install -y \
- cscope ctags libz-dev libexpat-dev python language-pack-en texinfo \
- build-essential g++ git bison flex unzip libxml-simple-perl \
- libxml-sax-perl libxml2-dev libxml2-utils xsltproc wget cpio bc \
- vim-common
-RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
+RUN apt-get update && apt-get install -yy \
+ bc \
+ bison \
+ build-essential \
+ cscope \
+ cpio \
+ ctags \
+ flex \
+ g++ \
+ git \
+ libexpat-dev \
+ libz-dev \
+ libxml-sax-perl \
+ libxml-simple-perl \
+ libxml2-dev \
+ libxml2-utils \
+ language-pack-en \
+ python \
+ texinfo \
+ unzip \
+ vim-common \
+ wget\
+ xsltproc
+
+RUN grep -q ${GROUPS} /etc/group || groupadd -g ${GROUPS} ${USER}
+RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER}
USER ${USER}
ENV HOME ${HOME}