Commit graph

14 commits

Author SHA1 Message Date
Christopher Franko
efc04c3cbd Merge branch 'rebase-1.5.9' 2017-03-29 19:39:05 -04:00
Christopher Franko
85d410d34e move all the deps to the latest repo
This was over looked for so long because it was already taken care of in
the newer branches.
2017-03-20 09:11:55 -04:00
Péter Szilágyi
f9b2fd79e8 containers: regroup and add Alpine images (31 MB) 2016-01-30 20:55:44 +02:00
caktux
896c134d30 separate and optimize Dockerfile for master and develop 2016-01-22 04:03:41 -05:00
Christopher Franko
abff06ca98 update dockerfile 2016-01-15 16:40:24 -05:00
Christopher Franko
89e13e1c80 update dockerfile take out develop branch checkout 2016-01-11 15:57:45 -05:00
Christopher Franko
ce96716426 update dockerfile 2016-01-11 15:40:54 -05:00
Christopher Franko
9cdd178759 Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1
Conflicts:
	Godeps/Godeps.json
	Godeps/_workspace/src/github.com/expanse-project/ethash/ethash_test.go
	Makefile
	VERSION
	cmd/gexp/blocktestcmd.go
	cmd/gexp/js.go
	cmd/gexp/js_test.go
	cmd/gexp/main.go
	cmd/utils/cmd.go
	cmd/utils/flags.go
	common/natspec/natspec.go
	common/natspec/natspec_e2e_test.go
	common/natspec/natspec_e2e_test.go.orig
	common/path.go
	common/registrar/registrar.go
	core/block_processor.go
	core/block_processor_test.go
	core/chain_manager.go
	core/chain_manager_test.go
	core/chain_util_test.go
	core/events.go
	core/execution.go
	core/filter.go
	core/state/errors.go
	core/state/statedb.go
	core/state_transition.go
	core/transaction_util.go
	core/types/bloom9.go
	core/types/common.go
	core/types/derive_sha.go
	core/types/receipt.go
	core/vm/common.go
	core/vm/environment.go
	core/vm/instructions.go
	core/vm/jit.go
	core/vm/jit_test.go
	core/vm/vm.go
	docker/Dockerfile
	docker/supervisord.conf
	eth/downloader/modes.go
	event/filter/eth_filter.go
	exp/backend.go
	exp/downloader/downloader.go
	exp/downloader/downloader_test.go
	exp/downloader/peer.go
	exp/downloader/queue.go
	exp/gasprice.go
	exp/handler.go
	exp/sync.go
	miner/worker.go
	rpc/api/admin.go
	rpc/api/debug.go
	rpc/api/eth.go
	rpc/api/eth_args.go
	rpc/api/miner.go
	rpc/api/personal.go
	rpc/comms/ipc.go
	rpc/comms/ipc_unix.go
	rpc/comms/ipc_windows.go
	tests/block_test_util.go
	tests/files/BlockchainTests/bcUncleTest.json
	trie/cache.go
	trie/fullnode.go
	trie/hashnode.go
	trie/secure_trie.go
	trie/shortnode.go
	trie/trie.go
	trie/trie_test.go
	trie/valuenode.go
	xeth/xeth.go
2015-11-03 18:25:50 -05:00
caktux
57ab147388 update Dockerfile, remove supervisord and unattended-upgrades 2015-10-26 18:06:19 -04:00
Christopher Franko
1c45431c53 update testnet block
update docker

update docker file

docker update 2

oi

docker again

update testnet block

update docker

update docker file

docker update 2

oi

docker again

update testnet block

update docker

update docker file

docker update 2

oi

docker again

docker2

docker3

fixed gvm

docker change

docking is meh

i hate docker

dockingsucks

update blockreward to 8

because its a lucky number 💃

update 60606 to 42786

60606 looks evil
42786 is my birthday

update jsre

replace eth for exp

update blocktime and test_genesis

fix test genesis
2015-09-07 20:25:05 -04:00
Christopher Franko
d368397fc2 test change lol 2015-08-07 15:37:14 -04:00
Felix Lange
33083e6f6c Revert "Revert "refactor Dockerfile"" 2015-04-22 21:35:46 +02:00
Felix Lange
1a0b3d8c84 Revert "refactor Dockerfile" 2015-04-22 20:52:21 +02:00
caktux
39047d7d8b refactor Dockerfile 2015-04-22 11:38:54 -04:00