Browse Source

fix: dev: removed ``--force-yes`` everywhere as it is deprecated

Signed-off-by: Valentin Lab <valentin.lab@kalysto.org>
upd-docker
Valentin Lab 4 years ago
parent
commit
5ed8035520
  1. 3
      apache/build/Dockerfile
  2. 2
      cron/build/Dockerfile
  3. 4
      mysql/hooks/install
  4. 4
      precise/0k-odoo-light/hooks/install
  5. 2
      precise/apt-cacher/hooks/install
  6. 8
      precise/base-0k/hooks/install.d/00-base.sh
  7. 2
      precise/base-0k/hooks/install.d/05-shyaml.sh
  8. 6
      precise/base-0k/hooks/install.d/20-kal-scripts.sh
  9. 2
      precise/ca/hooks/install
  10. 2
      precise/git/hooks/install
  11. 2
      precise/host/hooks/install.d/50-lxc.sh
  12. 2
      precise/host/hooks/install.d/60-docker.sh
  13. 2
      precise/host/hooks/install.d/70-0k.sh
  14. 2
      precise/mirror/hooks/install
  15. 2
      precise/pypi-cacher/hooks/install
  16. 2
      precise/svn/hooks/install
  17. 8
      precise/vpn/hooks/install
  18. 2
      rsync-backup/build/Dockerfile

3
apache/build/Dockerfile

@ -67,8 +67,7 @@ RUN apt-get update && \
RUN a2enmod headers proxy_http rewrite ssl proxy_wstunnel http2 proxy_connect RUN a2enmod headers proxy_http rewrite ssl proxy_wstunnel http2 proxy_connect
## Can remove this when SSL certificate are all valid ones ## 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 COPY entrypoint.sh /entrypoint.sh

2
cron/build/Dockerfile

@ -1,7 +1,7 @@
FROM docker.0k.io/debian:jessie FROM docker.0k.io/debian:jessie
RUN apt-get update && \ 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 && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

4
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"} 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 password $MYSQL_PASSWORD"
debconf-set-selections <<< "mysql-server mysql-server/root_password_again 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

4
precise/0k-odoo-light/hooks/install

@ -15,7 +15,7 @@ DEPS_TO_REMOVE="git"
KEEP_ONLY_PO=${KEEP_ONLY_PO:-fr en de} 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 $DEPS $DEPS_TO_REMOVE
## XXXvlab: should use base-0k code instead ! ## XXXvlab: should use base-0k code instead !
@ -71,7 +71,7 @@ fi
RELEASE=jessie VIRTUALENV= hooks/install 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 apt-get autoremove -y
rm -rf /opt/apps/git-sub /usr/lib/git-core/git-sub rm -rf /opt/apps/git-sub /usr/lib/git-core/git-sub

2
precise/apt-cacher/hooks/install

@ -3,7 +3,7 @@
set -eux 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 ## This is needed to enable https_port

8
precise/base-0k/hooks/install.d/00-base.sh

@ -3,17 +3,17 @@
set +eux set +eux
apt-get update 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 \ less tmux mosh \
sudo git vim file </dev/null sudo git vim file </dev/null
apt-get -y --force-yes python-software-properties </dev/null ||
apt-get -y --force-yes software-properties-common </dev/null
apt-get -y python-software-properties </dev/null ||
apt-get -y software-properties-common </dev/null
case $(lsb_release -is) in case $(lsb_release -is) in
Ubuntu) Ubuntu)
apt-get install -y --force-yes language-pack-en </dev/null
apt-get install -y language-pack-en </dev/null
;; ;;
Debian) Debian)
sed -ri 's/^\s*#\s*(en_US\.UTF-?8.*)\s*$/\1/g' /etc/locale.gen sed -ri 's/^\s*#\s*(en_US\.UTF-?8.*)\s*$/\1/g' /etc/locale.gen

2
precise/base-0k/hooks/install.d/05-shyaml.sh

@ -2,6 +2,6 @@
## For shyaml ## For shyaml
apt-get install -y --force-yes python-pip libyaml-dev python-dev </dev/null
apt-get install -y python-pip libyaml-dev python-dev </dev/null
pip install shyaml --upgrade pip install shyaml --upgrade

6
precise/base-0k/hooks/install.d/20-kal-scripts.sh

@ -10,7 +10,7 @@ set -eux
if ! [ -e /etc/apt/sources.list.d/kalysto.org.list ]; then if ! [ -e /etc/apt/sources.list.d/kalysto.org.list ]; then
## Required to fetch our repository in https ## Required to fetch our repository in https
apt-get install -y --force-yes apt-transport-https </dev/null
apt-get install -y apt-transport-https </dev/null
cat <<EOF > /etc/apt/sources.list.d/kalysto.org.list cat <<EOF > /etc/apt/sources.list.d/kalysto.org.list
## vlab's shell libraries ## vlab's shell libraries
@ -18,7 +18,7 @@ deb https://deb.kalysto.org no-dist kal-alpha kal-beta kal-main
EOF EOF
if ! type gpg >/dev/null; then if ! type gpg >/dev/null; then
apt-get install -y --force-yes gnupg2 </dev/null
apt-get install -y gnupg2 </dev/null
fi fi
## Include the GPG key ## Include the GPG key
wget -O - https://deb.kalysto.org/conf/public-key.gpg | apt-key add - wget -O - https://deb.kalysto.org/conf/public-key.gpg | apt-key add -
@ -28,4 +28,4 @@ EOF
-o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
fi fi
apt-get install -y --force-yes kal-scripts </dev/null
apt-get install -y kal-scripts </dev/null

2
precise/ca/hooks/install

@ -2,7 +2,7 @@
set -eux # -x for verbose logging to juju debug-log set -eux # -x for verbose logging to juju debug-log
apt-get install -y --force-yes kal-manage ## this is for ``mkcrt``
apt-get install -y kal-manage ## this is for ``mkcrt``
CA_SUBJECT=${CA_SUBJECT:-/C=FR/ST=France/O=Kalysto/CN=kal.fr/emailAddress=ca@kal.fr} CA_SUBJECT=${CA_SUBJECT:-/C=FR/ST=France/O=Kalysto/CN=kal.fr/emailAddress=ca@kal.fr}

2
precise/git/hooks/install

@ -9,7 +9,7 @@ GIT_0K_BASE=${GIT_0K_BASE:-"0k-ro:/var/git"}
GIT_0K_CLONE_OPTIONS=${GIT_0K_CLONE_OPTIONS:-""} GIT_0K_CLONE_OPTIONS=${GIT_0K_CLONE_OPTIONS:-""}
apt-get install -y --force-yes kal-shlib-common
apt-get install -y kal-shlib-common
apt-get install -y bzr apt-get install -y bzr

2
precise/host/hooks/install.d/50-lxc.sh

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
apt-get install lxc -y --force-yes </dev/null
apt-get install lxc -y </dev/null
## required to access the created lxc ! ## required to access the created lxc !
if ! [ -e ~/.ssh/id_rsa ]; then if ! [ -e ~/.ssh/id_rsa ]; then

2
precise/host/hooks/install.d/60-docker.sh

@ -21,7 +21,7 @@ if [ -n "$just_installed" ]; then
grep "$docker_version" | grep "$docker_version" |
head -n 1 | xargs echo)" head -n 1 | xargs echo)"
## DOWNGRADE to 17.xx because 18.xx do not support registry v1 ## DOWNGRADE to 17.xx because 18.xx do not support registry v1
apt-get install -y --force-yes docker-ce="$version"
apt-get install -y docker-ce="$version"
need_restart=true need_restart=true
fi fi

2
precise/host/hooks/install.d/70-0k.sh

@ -268,6 +268,6 @@ fi
ln -sfnv /opt/apps/0k-pgm/bin/* /usr/local/bin/ ln -sfnv /opt/apps/0k-pgm/bin/* /usr/local/bin/
find -L /usr/local/bin -maxdepth 1 -type l -ilname /opt/apps/0k-pgm/bin/\* -delete find -L /usr/local/bin -maxdepth 1 -type l -ilname /opt/apps/0k-pgm/bin/\* -delete
apt-get install -y --force-yes pv buffer < /dev/null
apt-get install -y pv buffer < /dev/null
apt-get install -y postgresql-client </dev/null apt-get install -y postgresql-client </dev/null
) )

2
precise/mirror/hooks/install

@ -7,7 +7,7 @@ set -eux # -x for verbose logging to juju debug-log
## kal-manage provides the script /usr/lib/kal/dusk/sbin/ssh-cmd-validate ## kal-manage provides the script /usr/lib/kal/dusk/sbin/ssh-cmd-validate
## used to validate any entrant connection to SSH. ## used to validate any entrant connection to SSH.
apt-get install -y --force-yes rsync kal-manage
apt-get install -y rsync kal-manage
mkdir -p /var/mirror mkdir -p /var/mirror

2
precise/pypi-cacher/hooks/install

@ -2,7 +2,7 @@
set -eux set -eux
apt-get install -y --force-yes python-pip
apt-get install -y python-pip
pip install devpi-server pip install devpi-server

2
precise/svn/hooks/install

@ -3,7 +3,7 @@
set -eux # -x for verbose logging to juju debug-log set -eux # -x for verbose logging to juju debug-log
apt-get install -y --force-yes kal-shlib-pretty kal-scripts subversion
apt-get install -y kal-shlib-pretty kal-scripts subversion
mkdir -p /var/svn mkdir -p /var/svn

8
precise/vpn/hooks/install

@ -2,7 +2,7 @@
set -eux set -eux
apt-get install -y --force-yes wget git kal-scripts python
apt-get install -y wget git kal-scripts python
if test -z "${RELEASE:-}"; then if test -z "${RELEASE:-}"; then
if type -p lsb_release; then if type -p lsb_release; then
@ -19,7 +19,7 @@ fi
# ## Update only this repo: # ## Update only this repo:
# apt-get update -o Dir::Etc::sourcelist="sources.list.d/swupdate.openvpn.net.list" \ # apt-get update -o Dir::Etc::sourcelist="sources.list.d/swupdate.openvpn.net.list" \
# -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" # -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
# apt-get -y --force-yes install openvpn
# apt-get -y install openvpn
export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
dpkg -i deb/openvpn_*.deb || true dpkg -i deb/openvpn_*.deb || true
@ -45,7 +45,7 @@ mkdir -p /var/run/openvpn /var/log/openvpn
mkdir -p /opt/apps mkdir -p /opt/apps
( (
apt-get install -y --force-yes python-setuptools python-twisted python-crypto python-yaml python-pyptlib
apt-get install -y python-setuptools python-twisted python-crypto python-yaml python-pyptlib
cd /opt/apps && cd /opt/apps &&
git clone https://git.torproject.org/pluggable-transports/obfsproxy.git && git clone https://git.torproject.org/pluggable-transports/obfsproxy.git &&
cd obfsproxy && cd obfsproxy &&
@ -54,7 +54,7 @@ mkdir -p /opt/apps
## obfs4proxy does not work with OpenVPN for now. ## obfs4proxy does not work with OpenVPN for now.
# ( # (
# apt-get install --force-yes -y golang &&
# apt-get install -y golang &&
# cd /opt/apps && # cd /opt/apps &&
# mkdir obfs4 && # mkdir obfs4 &&
# cd obfs4 && # cd obfs4 &&

2
rsync-backup/build/Dockerfile

@ -6,7 +6,7 @@ MAINTAINER Valentin Lab <valentin.lab@kalysto.org>
RUN apk add bash rsync sudo openssh-client RUN apk add bash rsync sudo openssh-client
# RUN apt-get update && \ # 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 && \ # apt-get clean && \
# rm -rf /var/lib/apt/lists/* # rm -rf /var/lib/apt/lists/*

Loading…
Cancel
Save