Skip to content

Commit

Permalink
Remove Vagrant dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
ailispaw committed Jun 27, 2018
1 parent c572719 commit a98646c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
13 changes: 5 additions & 8 deletions contrib/update-docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ ISO_NAME := barge-x.iso

EXTERNAL_DEPENDENCIES := bzImage rootfs.tar.xz isolinux.cfg docker.tgz docker.bash-completion

VAGRANT := vagrant

iso: $(ISO_NAME)

$(ISO_NAME): Dockerfile docker $(EXTERNAL_DEPENDENCIES)
$(VAGRANT) up --no-provision
$(VAGRANT) provision
$(VAGRANT) suspend
docker build -t barge-x .
docker run --rm barge-x > $@

bzImage rootfs.tar.xz:
curl -L https://github.com/bargees/barge-os/releases/download/$(BARGE_VERSION)/$(@F) -o $@
Expand All @@ -28,9 +25,9 @@ docker.bash-completion:
curl -L https://raw.githubusercontent.com/docker/docker-ce/v$(DOCKER_VERSION)/components/cli/contrib/completion/bash/docker -o $@

clean:
-$(VAGRANT) destroy -f
$(RM) -r .vagrant
$(RM) $(EXTERNAL_DEPENDENCIES)

distclean: clean
$(RM) $(ISO_NAME)

.PHONY: clean
.PHONY: clean distclean
10 changes: 1 addition & 9 deletions contrib/update-docker/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,5 @@ Vagrant.configure(2) do |config|

config.vm.hostname = "barge-x-iso"

config.vm.network :forwarded_port, guest: 2375, host: 2375, auto_correct: true, disabled: true

config.vm.synced_folder ".", "/vagrant"

config.vm.provision :docker do |docker|
docker.build_image "/vagrant/", args: "-t barge-x"
docker.run "barge-x", args: "--rm", cmd: "> /vagrant/barge-x.iso",
auto_assign_name: false, daemonize: false, restart: false
end
config.vm.synced_folder ".", "/vagrant", id: "vagrant"
end

0 comments on commit a98646c

Please sign in to comment.