Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add dmsghttp feature #131

Merged
merged 13 commits into from
Jan 11, 2022
Merged

add dmsghttp feature #131

merged 13 commits into from
Jan 11, 2022

Conversation

mrpalide
Copy link
Contributor

@mrpalide mrpalide commented Nov 17, 2021

Fixes skywire-services #423

Changes:

  • add a checkbox to use dmsghttp configuration on skyimager
  • download and store dmsghttp-config.json file from skywire repo and put in image on make build-skybian-img

How to test:

  • clone this branch git clone [email protected]:mrpalide/skybian.git --branch feature/dsmghttp
  • clone skywire@develop branch by git clone [email protected]:mrpalide/skywire.git --branch develop
  • edit go.mod and uncomment replace github.com/skycoin/skywire => ../skywire
  • make dep
  • change DMSGHTTP_CONFIG_URL on build.conf file to https://raw.githubusercontent.com/skycoin/skywire/develop/localServers.json
  • make an skybian image by something like make build-skybian-img BOARD=rpi64 ARCH=arm64 base on your board.
  • use make run-skyimager-gui and check Use dmsgHTTP.
  • build final image and burn on your SD card.
  • after first run of board, check /etc/skywire-config.json to see new dmsghttp URLs services.

Does this change need to mentioned in CHANGELOG.md?
Yes

@mrpalide mrpalide changed the title [WIP] add dmsghttp feature add dmsghttp feature Nov 18, 2021
pkg/boot/params.go Outdated Show resolved Hide resolved
pkg/prepconf/prepare.go Outdated Show resolved Hide resolved
@ersonp
Copy link
Contributor

ersonp commented Nov 19, 2021

As this PR has been merged already and there are a few changes regarding the dmsgHTTPServersData in this PR we should change the required PR to the second one. Also if the requested changes are feasible @mrpalide then I will make the required changes for dmsgHTTPServersData in the PR.

build.conf Outdated
@@ -29,6 +29,8 @@ SKYWIRE_VERSION=v0.5.0

SKYWIRE_ARM64_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm64.tar.gz"
SKYWIRE_ARM_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm.tar.gz"

DMSGHTTP_CONFIG_URL="https://raw.githubusercontent.com/skycoin/skywire/master/dmsghttp-config.json"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will fail for the time being, since we dont have that on master yet. Please change it to develop and make a ticket to swap it out once we make the new release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Its issue is #133.


if bp.DMSGHTTP == "dmsghttp" {
var dmsghttpData visorconfig.DmsgHTTPServers
dmsghttpFile, err := os.Open("/etc/dmsghttp-config.json")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just use os.Readfile here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. Handled.

@jdknives jdknives merged commit f43c4a2 into skycoin:develop Jan 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants