Merge pull request #1199 from dbungert/aptdep-cloudinit
aptdeps: cloud-init, cleanup
This commit is contained in:
commit
6927d3bec8
8
Makefile
8
Makefile
|
@ -25,13 +25,7 @@ all: dryrun
|
||||||
.PHONY: aptdeps
|
.PHONY: aptdeps
|
||||||
aptdeps:
|
aptdeps:
|
||||||
sudo apt update && \
|
sudo apt update && \
|
||||||
sudo apt-get install -y python3-urwid python3-pyudev python3-nose python3-flake8 \
|
sudo apt-get install -y $(shell cat apt-deps.txt)
|
||||||
python3-yaml python3-coverage python3-dev pkg-config libnl-genl-3-dev \
|
|
||||||
libnl-route-3-dev python3-attr python3-distutils-extra python3-requests \
|
|
||||||
python3-requests-unixsocket python3-jsonschema python3-apport \
|
|
||||||
python3-bson xorriso isolinux python3-aiohttp cloud-init ssh-import-id \
|
|
||||||
curl jq build-essential python3-pytest python3-async-timeout \
|
|
||||||
language-selector-common fuseiso python3-pytest-xdist python3-aioresponses
|
|
||||||
|
|
||||||
.PHONY: install_deps
|
.PHONY: install_deps
|
||||||
install_deps: aptdeps gitdeps
|
install_deps: aptdeps gitdeps
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
build-essential
|
||||||
|
cloud-init
|
||||||
|
curl
|
||||||
|
fuseiso
|
||||||
|
git
|
||||||
|
isolinux
|
||||||
|
jq
|
||||||
|
language-selector-common
|
||||||
|
libnl-3-dev
|
||||||
|
libnl-genl-3-dev
|
||||||
|
libnl-route-3-dev
|
||||||
|
libsystemd-dev
|
||||||
|
lsb-release
|
||||||
|
pep8
|
||||||
|
pkg-config
|
||||||
|
python3-aiohttp
|
||||||
|
python3-aioresponses
|
||||||
|
python3-apport
|
||||||
|
python3-async-timeout
|
||||||
|
python3-attr
|
||||||
|
python3-bson
|
||||||
|
python3-coverage
|
||||||
|
python3-dev
|
||||||
|
python3-distutils-extra
|
||||||
|
python3-flake8
|
||||||
|
python3-jsonschema
|
||||||
|
python3-nose
|
||||||
|
python3-pip
|
||||||
|
python3-pyflakes
|
||||||
|
python3-pytest
|
||||||
|
python3-pytest-xdist
|
||||||
|
python3-pyudev
|
||||||
|
python3-requests
|
||||||
|
python3-requests-unixsocket
|
||||||
|
python3-setuptools
|
||||||
|
python3-urwid
|
||||||
|
python3-wheel
|
||||||
|
python3-yaml
|
||||||
|
ssh-import-id
|
||||||
|
xorriso
|
|
@ -13,7 +13,10 @@ ConditionPathExists=/dev/zfs
|
||||||
EOF
|
EOF
|
||||||
cp -r /etc/systemd/system/zfs-mount.service.d/ /etc/systemd/system/zfs-share.service.d/
|
cp -r /etc/systemd/system/zfs-mount.service.d/ /etc/systemd/system/zfs-share.service.d/
|
||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
apt-get install -o APT::Get::Always-Include-Phased-Updates=true -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel pep8 python3-pyflakes python3-bson make curl jq build-essential python3-pytest python3-async-timeout language-selector-common python3-pytest-xdist python3-aioresponses
|
apt-get install \
|
||||||
|
-o APT::Get::Always-Include-Phased-Updates=true \
|
||||||
|
-y --no-install-recommends \
|
||||||
|
$(cat apt-deps.txt)
|
||||||
pip3 install -r requirements.txt
|
pip3 install -r requirements.txt
|
||||||
|
|
||||||
make gitdeps
|
make gitdeps
|
||||||
|
|
Loading…
Reference in New Issue