diff --git a/apache/build/Dockerfile b/apache/build/Dockerfile index 610c59a..00beb16 100644 --- a/apache/build/Dockerfile +++ b/apache/build/Dockerfile @@ -67,8 +67,7 @@ RUN apt-get update && \ RUN a2enmod headers proxy_http rewrite ssl proxy_wstunnel http2 proxy_connect ## Can remove this when SSL certificate are all valid ones -RUN apt-get update && apt-get install -y --force-yes ssl-cert - +RUN apt-get update && apt-get install -y ssl-cert COPY entrypoint.sh /entrypoint.sh diff --git a/cron/build/Dockerfile b/cron/build/Dockerfile index 3b63160..7e7c5d1 100644 --- a/cron/build/Dockerfile +++ b/cron/build/Dockerfile @@ -1,7 +1,7 @@ FROM docker.0k.io/debian:jessie RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes cron moreutils && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y cron moreutils && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/mysql/hooks/install b/mysql/hooks/install index a615b58..02262a2 100755 --- a/mysql/hooks/install +++ b/mysql/hooks/install @@ -9,11 +9,11 @@ GIT_0K_CLONE_OPTIONS=${GIT_0K_CLONE_OPTIONS:-""} GIT_0K_BASE=${GIT_0K_BASE:-"git.0k.io:/var/git"} -apt-get install -y --force-yes cron kal-scripts +apt-get install -y cron kal-scripts debconf-set-selections <<< "mysql-server mysql-server/root_password password $MYSQL_PASSWORD" debconf-set-selections <<< "mysql-server mysql-server/root_password_again password $MYSQL_PASSWORD" -apt-get install -y --force-yes mysql-server +apt-get install -y mysql-server diff --git a/precise/0k-odoo-light/hooks/install b/precise/0k-odoo-light/hooks/install index eae1954..206b804 100755 --- a/precise/0k-odoo-light/hooks/install +++ b/precise/0k-odoo-light/hooks/install @@ -15,7 +15,7 @@ DEPS_TO_REMOVE="git" KEEP_ONLY_PO=${KEEP_ONLY_PO:-fr en de} -apt-get install -y --force-yes --no-install-recommends \ +apt-get install -y --no-install-recommends \ $DEPS $DEPS_TO_REMOVE ## XXXvlab: should use base-0k code instead ! @@ -71,7 +71,7 @@ fi RELEASE=jessie VIRTUALENV= hooks/install ) -apt-get remove -y --force-yes $DEPS_TO_REMOVE +apt-get remove -y $DEPS_TO_REMOVE apt-get autoremove -y rm -rf /opt/apps/git-sub /usr/lib/git-core/git-sub diff --git a/precise/apt-cacher/hooks/install b/precise/apt-cacher/hooks/install index f82c24a..7263429 100755 --- a/precise/apt-cacher/hooks/install +++ b/precise/apt-cacher/hooks/install @@ -3,7 +3,7 @@ set -eux -apt-get install -y --force-yes apt-cacher-ng +apt-get install -y apt-cacher-ng ## This is needed to enable https_port diff --git a/precise/base-0k/hooks/install.d/00-base.sh b/precise/base-0k/hooks/install.d/00-base.sh index f2ae3c9..b3fb49f 100755 --- a/precise/base-0k/hooks/install.d/00-base.sh +++ b/precise/base-0k/hooks/install.d/00-base.sh @@ -3,17 +3,17 @@ set +eux apt-get update -apt-get -y --force-yes install bash-completion wget bzip2 git-core \ +apt-get -y install bash-completion wget bzip2 git-core \ less tmux mosh \ sudo git vim file /etc/apt/sources.list.d/kalysto.org.list ## vlab's shell libraries @@ -18,7 +18,7 @@ deb https://deb.kalysto.org no-dist kal-alpha kal-beta kal-main EOF if ! type gpg >/dev/null; then - apt-get install -y --force-yes gnupg2 RUN apk add bash rsync sudo openssh-client # RUN apt-get update && \ -# DEBIAN_FRONTEND=noninteractive apt-get install --force-yes -y --no-install-recommends rsync sudo openssh-client && \ +# DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends rsync sudo openssh-client && \ # apt-get clean && \ # rm -rf /var/lib/apt/lists/*