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

Updated Makefile for device-modbus-go #2

Merged
merged 1 commit into from Dec 7, 2018

Conversation

jamesrgregg
Copy link
Contributor

  • include docker build instructions in makefile for device-modbus-go

Signed-off-by: James Gregg james.r.gregg@intel.com

docker_device_modbus_go:
docker build \
--label "git_sha=$(GIT_SHA)" \
Copy link

Choose a reason for hiding this comment

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

It doesn't look like GIT_SHA is being defined anywhere

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was missing a build argument in .PHONY.
I pushed a minor change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The GIT_SHA should come as a global variable from the git commit hash.

Copy link

Choose a reason for hiding this comment

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

You'll still need to add a line like this one: https://github.com/edgexfoundry/device-random/blob/master/Makefile#L13

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thank you @mhall119 I have pushed that change now.

docker_device_modbus_go:
docker build \
--label "git_sha=$(GIT_SHA)" \
Copy link

Choose a reason for hiding this comment

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

You'll still need to add a line like this one: https://github.com/edgexfoundry/device-random/blob/master/Makefile#L13

Copy link

@mhall119 mhall119 left a comment

Choose a reason for hiding this comment

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

Looks good to me now

mhall119
mhall119 previously approved these changes Dec 4, 2018
Copy link
Member

@cloudxxx8 cloudxxx8 left a comment

Choose a reason for hiding this comment

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

@jamesrgregg
Could you please squash your commit to only one?

Dockerfile Outdated
@@ -14,7 +14,12 @@ RUN echo http://nl.alpinelinux.org/alpine/v3.6/main > /etc/apk/repositories; \
RUN apk update && apk add make && apk add bash
RUN apk add curl && apk add git && apk add openssh
Copy link
Member

Choose a reason for hiding this comment

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

We could remove your script from below and add glide to the apk add command here.

Copy link
Member

Choose a reason for hiding this comment

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

Analogous to what happens here in config-seed Dockerfile https://github.com/edgexfoundry/edgex-go/blob/master/docker/Dockerfile.config-seed#L28-L34.
The issue you are currently hitting after you download the binary is that it's not on the PATH.
Installing via apk will solve this.

Copy link
Member

Choose a reason for hiding this comment

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

@jamesrgregg disregard everything I just said above, my apologies. I just realized you said there was a compilation issue and I see it now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also reverted back to the previous build image. The error is indicating that gcc isn't in the path.
I can perhaps try to add gcc via apk.

@jamesrgregg
Copy link
Contributor Author

recheck

 - include docker build instructions in makefile for device-modbus-go

Signed-off-by: James Gregg <james.r.gregg@intel.com>

Updated Dockerfile for device-modbus-go

 - add base-build to include gcc to alpine

Signed-off-by: James Gregg <james.r.gregg@intel.com>
Copy link
Member

@cloudxxx8 cloudxxx8 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@SteveOss SteveOss left a comment

Choose a reason for hiding this comment

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

LGTM

@SteveOss SteveOss merged commit 1acffe1 into edgexfoundry:master Dec 7, 2018
@jamesrgregg jamesrgregg deleted the modify-makefile-docker branch December 13, 2018 15:59
tonyespy added a commit to tonyespy/device-modbus-go that referenced this pull request May 7, 2021
…nt-interfaces

feat(snap): add content interface for device configuration
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.

None yet

5 participants