boxes: Remove redundant lxc
from intermediate container names
This commit is contained in:
parent
dd31e1f74a
commit
44ad630db7
1 changed files with 3 additions and 3 deletions
|
@ -10,14 +10,14 @@ ubuntu: $(UBUNTU_BOXES)
|
|||
debian: $(DEBIAN_BOXES)
|
||||
|
||||
# REFACTOR: Figure out how can we reduce duplicated code
|
||||
$(UBUNTU_BOXES): CONTAINER = "vagrant-lxc-base-${@}-amd64"
|
||||
$(UBUNTU_BOXES): CONTAINER = "vagrant-base-${@}-amd64"
|
||||
$(UBUNTU_BOXES): PACKAGE = "output/${TODAY}/vagrant-lxc-${@}-amd64.box"
|
||||
$(UBUNTU_BOXES):
|
||||
@mkdir -p $$(dirname $(PACKAGE))
|
||||
@sudo -E ./mk-debian.sh ubuntu $(@) amd64 $(CONTAINER) $(PACKAGE)
|
||||
@sudo chmod +rw $(PACKAGE)
|
||||
@sudo chown ${USER}: $(PACKAGE)
|
||||
$(DEBIAN_BOXES): CONTAINER = "vagrant-lxc-base-${@}-amd64"
|
||||
$(DEBIAN_BOXES): CONTAINER = "vagrant-base-${@}-amd64"
|
||||
$(DEBIAN_BOXES): PACKAGE = "output/${TODAY}/vagrant-lxc-${@}-amd64.box"
|
||||
$(DEBIAN_BOXES):
|
||||
@mkdir -p $$(dirname $(PACKAGE))
|
||||
|
@ -37,6 +37,6 @@ clean: ALL_BOXES = ${DEBIAN_BOXES} ${UBUNTU_BOXES} acceptance
|
|||
clean:
|
||||
@for r in $(ALL_BOXES); do \
|
||||
sudo -E ./clean.sh $${r}\
|
||||
vagrant-lxc-base-$${r}-amd64 \
|
||||
vagrant-base-$${r}-amd64 \
|
||||
output/${TODAY}/vagrant-lxc-$${r}-amd64.box; \
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue