diff --git a/_assets/patches/geth/0003-dockerfiles-wnode-swarm.patch b/_assets/patches/geth/0003-dockerfiles-wnode-swarm.patch deleted file mode 100644 index 9e3077309..000000000 --- a/_assets/patches/geth/0003-dockerfiles-wnode-swarm.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/containers/docker/status-alpine/geth/Dockerfile b/containers/docker/status-alpine/geth/Dockerfile -new file mode 100644 -index 000000000..2cc2177d0 ---- /dev/null -+++ b/containers/docker/status-alpine/geth/Dockerfile -@@ -0,0 +1,20 @@ -+FROM alpine:3.5 -+ -+RUN \ -+ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ -+ -+ # clone status-go -+ mkdir -p /usr/lib/go/src/github.com/status-im && \ -+ git clone --depth 1 --branch 0.9.7 https://github.com/status-im/status-go.git /usr/lib/go/src/github.com/status-im/status-go && \ -+ -+ # clone go-ethereum (and install everything) -+ git clone --depth 1 --branch status/1.6.1-stable https://github.com/status-im/go-ethereum && \ -+ (cd go-ethereum && make geth) && \ -+ cp go-ethereum/build/bin/geth /geth && \ -+ apk del go git make gcc musl-dev linux-headers && \ -+ rm -rf /go-ethereum && rm -rf /var/cache/apk/* -+ -+EXPOSE 8545 -+EXPOSE 30303 -+ -+ENTRYPOINT ["/geth"] -diff --git a/containers/docker/status-alpine/swarm/Dockerfile b/containers/docker/status-alpine/swarm/Dockerfile -new file mode 100644 -index 000000000..685bf5ad9 ---- /dev/null -+++ b/containers/docker/status-alpine/swarm/Dockerfile -@@ -0,0 +1,19 @@ -+FROM alpine:3.5 -+ -+RUN \ -+ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ -+ -+ # clone status-go -+ mkdir -p /usr/lib/go/src/github.com/status-im && \ -+ git clone --depth 1 --branch develop https://github.com/status-im/status-go.git /usr/lib/go/src/github.com/status-im/status-go && \ -+ -+ # clone go-ethereum (and install everything) -+ git clone --depth 1 --branch status/1.6.1-stable https://github.com/status-im/go-ethereum && \ -+ (cd go-ethereum && build/env.sh go run build/ci.go install ./cmd/swarm) && \ -+ cp go-ethereum/build/bin/swarm /swarm && \ -+ apk del go git make gcc musl-dev linux-headers && \ -+ rm -rf /go-ethereum && rm -rf /var/cache/apk/* -+ -+EXPOSE 30399 -+ -+ENTRYPOINT ["/swarm"] -diff --git a/containers/docker/status-alpine/wnode/Dockerfile b/containers/docker/status-alpine/wnode/Dockerfile -new file mode 100644 -index 000000000..e160ff9d7 ---- /dev/null -+++ b/containers/docker/status-alpine/wnode/Dockerfile -@@ -0,0 +1,19 @@ -+FROM alpine:3.5 -+ -+RUN \ -+ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ -+ -+ # clone status-go -+ mkdir -p /usr/lib/go/src/github.com/status-im && \ -+ git clone --depth 1 --branch develop https://github.com/status-im/status-go.git /usr/lib/go/src/github.com/status-im/status-go && \ -+ -+ # clone go-ethereum (and install everything) -+ git clone --depth 1 --branch status/1.6.1-stable https://github.com/status-im/go-ethereum && \ -+ (cd go-ethereum && build/env.sh go run build/ci.go install ./cmd/wnode) && \ -+ cp go-ethereum/build/bin/wnode /wnode && \ -+ apk del go git make gcc musl-dev linux-headers && \ -+ rm -rf /go-ethereum && rm -rf /var/cache/apk/* -+ -+EXPOSE 30379 -+ -+ENTRYPOINT ["/wnode"] diff --git a/_assets/patches/geth/README.md b/_assets/patches/geth/README.md index f67dc4951..59e4e0838 100644 --- a/_assets/patches/geth/README.md +++ b/_assets/patches/geth/README.md @@ -20,7 +20,6 @@ Instructions for creating a patch from the command line: - [`0000-accounts-hd-keys.patch`](./0000-accounts-hd-keys.patch) — adds support for HD extended keys (links/docs?) - [`0002-les-api-status.patch`](./0002-les-api-status.patch) — adds StatusBackend into LES code (need to be inspected, some things can and should be done outside of les code -- [`0003-dockerfiles-wnode-swarm.patch`](./0003-dockerfiles-wnode-swarm.patch) — adds Dockerfiles (who uses this?) - [`0004-whisper-notifications.patch`](./0004-whisper-notifications.patch) — adds Whisper notifications (need to be reviewed and documented) - [`0006-latest-cht.patch`](./0006-latest-cht.patch) – updates CHT root hashes, should be updated regularly to keep sync fast, until proper Trusted Checkpoint sync is not implemented as part of LES/2 protocol. - [`0007-README.patch`](./0007-README.patch) — update upstream README.md. diff --git a/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/geth/Dockerfile b/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/geth/Dockerfile deleted file mode 100644 index 2cc2177d0..000000000 --- a/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/geth/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM alpine:3.5 - -RUN \ - apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - - # clone status-go - mkdir -p /usr/lib/go/src/github.com/status-im && \ - git clone --depth 1 --branch 0.9.7 https://github.com/status-im/status-go.git /usr/lib/go/src/github.com/status-im/status-go && \ - - # clone go-ethereum (and install everything) - git clone --depth 1 --branch status/1.6.1-stable https://github.com/status-im/go-ethereum && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apk del go git make gcc musl-dev linux-headers && \ - rm -rf /go-ethereum && rm -rf /var/cache/apk/* - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] diff --git a/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/swarm/Dockerfile b/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/swarm/Dockerfile deleted file mode 100644 index 685bf5ad9..000000000 --- a/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/swarm/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM alpine:3.5 - -RUN \ - apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - - # clone status-go - mkdir -p /usr/lib/go/src/github.com/status-im && \ - git clone --depth 1 --branch develop https://github.com/status-im/status-go.git /usr/lib/go/src/github.com/status-im/status-go && \ - - # clone go-ethereum (and install everything) - git clone --depth 1 --branch status/1.6.1-stable https://github.com/status-im/go-ethereum && \ - (cd go-ethereum && build/env.sh go run build/ci.go install ./cmd/swarm) && \ - cp go-ethereum/build/bin/swarm /swarm && \ - apk del go git make gcc musl-dev linux-headers && \ - rm -rf /go-ethereum && rm -rf /var/cache/apk/* - -EXPOSE 30399 - -ENTRYPOINT ["/swarm"] diff --git a/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/wnode/Dockerfile b/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/wnode/Dockerfile deleted file mode 100644 index e160ff9d7..000000000 --- a/vendor/github.com/ethereum/go-ethereum/containers/docker/status-alpine/wnode/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM alpine:3.5 - -RUN \ - apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - - # clone status-go - mkdir -p /usr/lib/go/src/github.com/status-im && \ - git clone --depth 1 --branch develop https://github.com/status-im/status-go.git /usr/lib/go/src/github.com/status-im/status-go && \ - - # clone go-ethereum (and install everything) - git clone --depth 1 --branch status/1.6.1-stable https://github.com/status-im/go-ethereum && \ - (cd go-ethereum && build/env.sh go run build/ci.go install ./cmd/wnode) && \ - cp go-ethereum/build/bin/wnode /wnode && \ - apk del go git make gcc musl-dev linux-headers && \ - rm -rf /go-ethereum && rm -rf /var/cache/apk/* - -EXPOSE 30379 - -ENTRYPOINT ["/wnode"]