Skip to content

Commit

Permalink
Resolve go dev build issue (#198)
Browse files Browse the repository at this point in the history
* Refactored start docs

* Changed source of go-bindata #197

* Updated go dep trackers

* Updated yarn dependencies

* Added update step to Makefile

* New auto-generated bindata tests

* Added doc note about make update

* yarn upgrade

* Doc: rename Infura key as "project ID" for clarity

* Set resource class to medium for CircleCI builds

* Use Debian 'stable' release in Docker
  • Loading branch information
loleg authored Dec 18, 2020
1 parent 3cf664b commit 6363d5f
Show file tree
Hide file tree
Showing 9 changed files with 2,526 additions and 2,188 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:

test-integration-go:
executor: docker-image-golang-dependencies
resource_class: large
resource_class: medium
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:

coverage-go:
executor: docker-image-golang-dependencies
resource_class: large
resource_class: medium
steps:
- checkout
- attach_workspace:
Expand All @@ -142,7 +142,7 @@ jobs:

test-ui:
executor: docker-image-golang-dependencies
resource_class: large
resource_class: medium
steps:
- checkout
- attach_workspace:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:stretch-slim
FROM debian:stable-slim

RUN apt-get update && apt-get install -y \
ca-certificates \
Expand Down
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,16 @@ all: ui server
init:
@for d in $(dependencies); do (echo "Checking $$d is installed... " && which $$d ) || ( echo "Please install $$d before continuing" && exit 1 ); done
go install golang.org/x/tools/cmd/goimports
go install github.com/asticode/go-bindata/go-bindata
go install github.com/go-bindata/go-bindata/go-bindata
go install github.com/golang/mock/mockgen
go install github.com/wadey/gocovmerge
go install golang.org/x/tools/cmd/godoc

.PHONY: update
update:
echo "Updating all Go packages"
go get -u all

.PHONY: ui
ui:
$(MAKE) -C ui
Expand Down
11 changes: 7 additions & 4 deletions docs/build_all.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The project uses go modules.
Clone the repository outside your GOPATH:
```
cd <your workspace>
git clone https://github.com/ProxeusApp/proxeus-core.git
git clone https://github.com/ProxeusApp/proxeus-core.git
cd proxeus-core
```

Expand All @@ -56,7 +56,7 @@ All the build projects are stated in `./Makefile`.
Before building Proxeus, make sure to set all [required environment variables](../README.md#quick-start-with-docker).
```
export PROXEUS_DATA_DIR=./data
export PROXEUS_INFURA_API_KEY=<Your Infura API key>
export PROXEUS_INFURA_API_KEY=<Your Infura project ID>
export PROXEUS_SPARKPOST_API_KEY=<Your SparkPost API Key>
export PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS=0x1d3e5c81bf4bc60d41a8fbbb3d1bae6f03a75f71
export PROXEUS_ALLOW_HTTP=true
Expand All @@ -71,6 +71,11 @@ To initialize dependencies run:
make init
```

To update go dependencies run:
```
make update
```

The make all command build the `server` and `ui`:
```
make all
Expand All @@ -85,5 +90,3 @@ Run `server`.
The platform will be available at the following URL: http://localhost:1323

It is now time to [configure your platform](configure.md)


2 changes: 1 addition & 1 deletion docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ services:
Run the following command in the directory containing your `docker-compose.yml` file (Linux and OSX):
```
export PROXEUS_EMAIL_FROM=<Your valid Sender Email Address>
export PROXEUS_INFURA_API_KEY=<Your Infura API key>
export PROXEUS_INFURA_API_KEY=<Your Infura project ID>
export PROXEUS_SPARKPOST_API_KEY=<Your SparkPost API Key>
export PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS=0x1d3e5c81bf4bc60d41a8fbbb3d1bae6f03a75f71
export PROXEUS_ALLOW_HTTP=true
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ require (
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
github.com/go-bindata/go-bindata v1.0.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
github.com/golang/mock v1.3.2-0.20191127180039-112dfb85f71e
github.com/google/go-querystring v1.0.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
github.com/go-bindata/go-bindata v1.0.0 h1:DZ34txDXWn1DyWa+vQf7V9ANc2ILTtrEjtlsdJRF26M=
github.com/go-bindata/go-bindata v1.0.0/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0 h1:8HUsc87TaSWLKwrnumgC8/YconD2fJQsRJAsWaPg2ic=
Expand Down
59 changes: 40 additions & 19 deletions test/assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6363d5f

Please sign in to comment.