diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 407d3f1..6a1c844 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: ^1.15 + go-version: '1.20.2' - name: Check out code uses: actions/checkout@v3 - name: Build diff --git a/Dockerfile b/Dockerfile index 54973b0..66b3ade 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,9 @@ -FROM golang:latest +FROM golang:1.20.2 WORKDIR /app COPY ./ /app -RUN go mod download +RUN go install github.com/githubnemo/CompileDaemon@latest -RUN go get github.com/githubnemo/CompileDaemon - -ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl \ No newline at end of file +ENTRYPOINT CompileDaemon --build="make build" --command=./bin/edgeboxctl-$(go env GOOS)-$(go env GOARCH) diff --git a/Makefile b/Makefile index 23e35ad..694cc77 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,13 @@ -PROJECT?=github.com/edgebox-iot/edgeboxctl +.DEFAULT_GOAL := build +PROJECT ?= github.com/edgebox-iot/edgeboxctl RELEASE ?= dev COMMIT := $(shell git rev-parse --short HEAD) BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S') BUILD_DIR = bin +GOOS := $(shell go env GOOS) +GOARCH := $(shell go env GOARCH) + build-all: GOOS=linux GOARCH=amd64 make build @@ -32,7 +36,6 @@ build: -X ${PROJECT}/internal/diagnostics.Commit=${COMMIT} \ -X ${PROJECT}/internal/diagnostics.BuildDate=${BUILD_DATE}" \ -o bin/edgeboxctl-${GOOS}-${GOARCH} ${PROJECT}/cmd/edgeboxctl - cp ./bin/edgeboxctl-${GOOS}-${GOARCH} ./bin/edgeboxctl clean: rm -rf ${BUILD_DIR} @@ -68,4 +71,3 @@ stop: log: start journalctl -fu edgeboxctl - diff --git a/README.md b/README.md index 124898a..82da0dc 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@
- A System Control module written in Go. Its resonsability is to configure dependencies and perform system tasks, automatically in a schedule, or by command.
+ A System Control module written in Go. Its responsibility is to configure dependencies and perform system tasks, automatically on a schedule, or on demand.
Report Bug
@@ -38,8 +38,6 @@
## About The Project
-[![Edgebox Screen Shot][product-screenshot]](https://edgebox.co)
-
Edgebox is an easy to configure and use system. It brings powerful features that go alongside or can even completely replace various services that you already use in the day-to-day.
@@ -58,18 +56,15 @@ To get a local copy up and running follow these simple steps.
### Prerequisites
-If you're installing this to run natively in the system, you better be doing it inside of the [Development Virtual Machine](https://github.com/edgebox-iot/devm). This software can do destructive action in the system is is running. You've been warned.
+If you're running for development purposes, a docker container suffices, so make sure you have:
-If you're running for development purposes, a Docker container suffices, so make sure you have:
-* Docker
-* Docker Compose
-```sh
-sudo apt-get install docker docker-compose
-```
+* docker
+* docker compose
Check the following links for more info on [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/).
-Aditionally, edgeboxctl needs the following bash commands available wherever it runs:
+Aditionally, `edgeboxctl` needs the following bash commands available wherever it runs:
+
* `arm-linux-gnueabi-gcc` (`sudo apt-get install gcc-arm*`)
* `sh`
* `rm`
@@ -121,4 +116,4 @@ Contributions are what make the open source community such an amazing place to b
## License
-Distributed under the MIT License. See `LICENSE` for more information.
+Distributed under the Elastic License 2.0. See `LICENSE` for more information.