Skip to content
This repository has been archived by the owner on Dec 19, 2022. It is now read-only.

DSR-1416: Fix to create VERSION file and handle docker build from command line #48

Merged
merged 4 commits into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The repository can be found on git at [libmraa](https://github.com/intel-iot-dev
2. Build a docker image by using the following command
```
sh> cd device-grove-c
sh> make version
sh> docker build . -t < device-grove-c > -f ./scripts/Dockerfile.alpine-3.11
Copy link
Member

@iain-anderson iain-anderson Oct 1, 2020

Choose a reason for hiding this comment

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

should the docker build line not read simply
sh> docker build . -t device-grove-c -f ./scripts/Dockerfile.alpine-3.11

Copy link
Contributor Author

Choose a reason for hiding this comment

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

<> - This is to indicate the image name can be anything and not fixed to device-grove-c. I can remove if it is not clear.

Copy link
Member

Choose a reason for hiding this comment

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

Yes please, maybe just say underneath "replacing device-grove-c with your preferred image name if necessary" or something


```
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/Dockerfile.alpine-3.11
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ RUN apk add --update --no-cache build-base git gcc cmake make linux-headers yaml
COPY scripts /device-grove/scripts
COPY src /device-grove/src/
COPY VERSION /device-grove/VERSION
COPY Makefile /device-grove/Makefile
RUN cd /device-grove && make -s version && rm -f /device-grove/Makefile
RUN mkdir -p /device-grove/build

WORKDIR /device-grove
Expand Down