Skip to content
Snippets Groups Projects
Unverified Commit 753e501f authored by Wolfgang Welz's avatar Wolfgang Welz Committed by GitHub
Browse files

Merge v0.1.3 changes (#300)

* Fix/upgrade packr (#291)

* :arrow_up: upgrades packr
* :recycle: go mod tidy

* Fix/upgrade yaml (#293)

* :arrow_up: upgrades packr

* :recycle: go mod tidy

* :arrow_up: upgrades js-yarn

* :arrow_up:

 upgrades js-yaml

Co-authored-by: default avatarWolfgang Welz <welzwo@gmail.com>

* Fix: docker stuff (#296)

* :whale: fixes Dockerfile and docker-compose.yml

* :whale: improves docker-compose

* :wrench: restores config.json

* :wrench:

 removes config.default.json

* Prepare v0.1.3 (#297)

* update CHANGELOG

Co-authored-by: default avatarAngelo Capossele <angelocapossele@gmail.com>
parent d940ecf7
Branches
Tags
No related merge requests found
# v0.1.3 - 2020-03-16
* Update SPA plugin's JS dependencies
* Upgrad `github.com/gobuffalo/packr` to v2.8.0
* Resolves a security issue in the packr dependency, which would allow an unauthenticated attacker to read any
file from the application's filesystem
# v0.1.2 - 2020-02-24
* Adds `--version` flag to retrieve the GoShimmer version
......
......@@ -42,6 +42,6 @@ EXPOSE 14626/udp
# Copy the Pre-built binary file from the previous stage
COPY --from=build /go/bin/goshimmer /run/goshimmer
# Copy the default config
COPY config.default.json config.json
COPY config.default.json /config.json
ENTRYPOINT ["/run/goshimmer", "--database.directory=/mainnetdb"]
ENTRYPOINT ["/run/goshimmer", "--config-dir=/", "--database.directory=/mainnetdb"]
......@@ -10,9 +10,21 @@ services:
dockerfile: Dockerfile
container_name: iota_goshimmer
restart: unless-stopped
# Mount volumes:
# make sure to give read/write access to the folder ./mainnetdb (e.g., chmod -R 777 ./mainnetdb)
# optionally, you can mount a config.json into the container
volumes:
- ./mainnetdb/:/mainnetdb/:rw
#- ./config.json:/config.json:ro
# Expose ports:
# gossip: - "14666:14666/tcp"
# autopeering: - "14626:14626/udp"
# webAPI: - "8080:8080/tcp"
# dashboard: - "8081:8081/tcp"
# graph: - "8082:8082/tcp"
ports:
- "14666:14666/tcp"
- "14626:14626/udp"
- "14626:14626/tcp"
#- "8080:8080/tcp"
#- "8081:8081/tcp"
#- "8082:8082/tcp"
......@@ -36,7 +36,9 @@ func Configure() {
engine.Static("/static", "./plugins/analysis/webinterface/httpserver/static")
engine.File("/", "./plugins/analysis/webinterface/httpserver/static/index.html")
} else {
engine.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static", http.FileServer(assetsBox))))
for _, res := range assetsBox.List() {
engine.GET("/static/"+res, echo.WrapHandler(http.StripPrefix("/static", http.FileServer(assetsBox))))
}
engine.GET("/", index)
}
......
......@@ -45,6 +45,9 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
},
"resolutions": {
"html-loader/htmlnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1"
},
"dependencies": {
"@types/glob": "^7.1.1",
"apexcharts": "^3.10.1",
......
......@@ -26,7 +26,7 @@ const history = syncHistoryWithStore(browserHistory, routerStore);
ReactDOM.render(
<Provider {...stores}>
<Router history={history}>
<App/>
<App history={history}/>
</Router>
</Provider>,
document.getElementById('root')
......
This diff is collapsed.
This diff is collapsed.
......@@ -47,8 +47,13 @@ func setupRoutes(e *echo.Echo) {
} else {
// load assets from packr: either from within the binary or actual disk
e.GET("/app/*", echo.WrapHandler(http.StripPrefix("/app", http.FileServer(appBox))))
e.GET("/assets/*", echo.WrapHandler(http.StripPrefix("/assets", http.FileServer(assetsBox))))
for _, res := range appBox.List() {
e.GET("/app/"+res, echo.WrapHandler(http.StripPrefix("/app", http.FileServer(appBox))))
}
for _, res := range assetsBox.List() {
e.GET("/assets/"+res, echo.WrapHandler(http.StripPrefix("/assets", http.FileServer(assetsBox))))
}
}
e.GET("/ws", websocketRoute)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment