set debian version in config

This commit is contained in:
2017-12-25 13:35:54 +00:00
parent c47f915bed
commit a309b8b92f
6 changed files with 21 additions and 11 deletions

View File

@@ -1,4 +1,5 @@
FROM = debian:stretch DEBIAN = stretch
FROM = debian:$(DEBIAN)
MODE = minimal MODE = minimal
PROXY = $(shell hostname -i) PROXY = $(shell hostname -i)
TIMEZONE = Europe/London TIMEZONE = Europe/London
@@ -59,6 +60,9 @@ prepare:
ifneq ($(PROXY),) ifneq ($(PROXY),)
$(call arg,http_proxy,http://$(PROXY):3142) $(call arg,http_proxy,http://$(PROXY):3142)
endif endif
ifneq ($(DEBIAN),)
$(call arg,DEBIAN,$(DEBIAN))
endif
ifneq ($(TIMEZONE),) ifneq ($(TIMEZONE),)
$(call arg,TIMEZONE,$(TIMEZONE)) $(call arg,TIMEZONE,$(TIMEZONE))
endif endif

View File

@@ -1,8 +1,11 @@
## Configuration
export_env FACETTE_VERSION 0.4.0
## Dependencies ## Dependencies
apt_install_permanent librrd4 mime-support wget apt_install_permanent librrd4 mime-support wget
## Facette ## Facette
wget https://github.com/facette/facette/releases/download/0.3.0/facette_0.3.0-1.jessie_amd64.deb wget https://github.com/facette/facette/releases/download/$FACETTE_VERSION/facette_$FACETTE_VERSION-1.$DEBIAN_amd64.deb
dpkg -i facette_0.3.0-1.jessie_amd64.deb dpkg -i facette_$FACETTE_VERSION-1.$DEBIAN_amd64.deb
mkdir -p /var/run/facette mkdir -p /var/run/facette
ln -s /usr/share/facette /usr/local/share/ ln -s /usr/share/facette /usr/local/share/

View File

@@ -8,7 +8,7 @@ export_env SDK_URL https://www.dropbox.com/s/wel0xazy2c45pqe/$SDK_BASENAME.zip
apt_install_permanent sudo linux-libc-dev apt_install_permanent sudo linux-libc-dev
## Cuda ## Cuda
echo 'deb http://deb.debian.org/debian stretch main contrib non-free' >> /etc/apt/sources.list echo 'deb http://deb.debian.org/debian $DEBIAN main contrib non-free' >> /etc/apt/sources.list
apt_install_permanent libcuda1 libnvidia-encode1 apt_install_permanent libcuda1 libnvidia-encode1
## FFmpeg ## FFmpeg

View File

@@ -1,4 +1,4 @@
## Enable multimedia sources in APT ## Enable multimedia sources in APT
echo 'deb http://www.deb-multimedia.org stretch main non-free' >> /etc/apt/sources.list echo 'deb http://www.deb-multimedia.org $DEBIAN main non-free' >> /etc/apt/sources.list
echo 'deb-src http://www.deb-multimedia.org stretch main non-free' >> /etc/apt/sources.list echo 'deb-src http://www.deb-multimedia.org $DEBIAN main non-free' >> /etc/apt/sources.list
apt_install_permanent deb-multimedia-keyring apt_install_permanent deb-multimedia-keyring

View File

@@ -1,7 +1,10 @@
## Dependencies
apt_install_permanent procps
## MySQL ## MySQL
debconf-set-selections <<< 'mariadb-server mariadb-server/root_password password dummy' debconf-set-selections <<< 'mariadb-server mariadb-server/root_password password dummy'
debconf-set-selections <<< 'mariadb-server mariadbql-server/root_password_again password dummy' debconf-set-selections <<< 'mariadb-server mariadbql-server/root_password_again password dummy'
apt_install_permanent mariadb-server apt_install_permanent mariadb-server
## Environment ## Environment
export_env MYSQL_CONFIG /etc/mysql/my.cnf export_env MYSQL_CONFIG /etc/mysql/my.cnf
@@ -16,4 +19,4 @@ tee -a $MYSQL_CONFIG <<EOF
[mysqld] [mysqld]
skip-grant-tables skip-grant-tables
EOF EOF

View File

@@ -15,9 +15,9 @@ echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup
export_env INITRD no export_env INITRD no
# Enable sources and backports in APT # Enable sources and backports in APT
echo 'deb-src http://httpredir.debian.org/debian/ stretch main' >> /etc/apt/sources.list echo "deb-src http://deb.debian.org/debian/ $DEBIAN main" >> /etc/apt/sources.list
echo 'deb http://httpredir.debian.org/debian/ stretch-backports main contrib non-free' >> /etc/apt/sources.list echo "deb http://deb.debian.org/debian/ $DEBIAN-backports main contrib non-free" >> /etc/apt/sources.list
echo 'deb-src http://httpredir.debian.org/debian/ stretch-backports main contrib non-free' >> /etc/apt/sources.list echo "deb-src http://deb.debian.org/debian/ $DEBIAN-backports main contrib non-free" >> /etc/apt/sources.list
## Fix some issues with APT packages ## Fix some issues with APT packages
# See https://github.com/dotcloud/docker/issues/1024 # See https://github.com/dotcloud/docker/issues/1024