diff --git a/Makefile b/Makefile index b5a66a72..f6a5bc71 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ appname := smarthome workingdir := smarthome sources := $(wildcard *.go) -version := 0.0.29-beta +version := 0.0.29 build = CGO_ENABLED=0 GOOS=$(1) GOARCH=$(2) go build -ldflags "-s -w" -v -o $(appname) $(4) tar = mkdir -p build && cd ../ && tar -cvzf ./$(appname)_$(1)_$(2).tar.gz $(workingdir)/$(appname) $(workingdir)/web/dist $(workingdir)/web/html $(workingdir)/resources && mv $(appname)_$(1)_$(2).tar.gz $(workingdir)/build @@ -22,7 +22,7 @@ test: touch web/dist/html/testing.html # Prevents server panic - cd docker/testing && docker-compose up -d + # cd docker && docker-compose -f testing-database-docker-compose.yml up -d go test -v -p 1 ./... --timeout=10000s # Tests should be run one after another due to deletion of the database at every test start rm -rf web/dist/html/testing.html diff --git a/README.md b/README.md index c96bf6ee..6fc32647 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Smarthome -**Version**: `0.0.29-beta` +**Version**: `0.0.29` A completely self-built Smarthome-system written in Go. diff --git a/docker/Dockerfile b/docker/Dockerfile index 678b5d2e..e6e88951 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3 LABEL author="MikMuellerDev" -LABEL version="0.0.29-beta" +LABEL version="0.0.29" COPY ./app /app @@ -23,7 +23,7 @@ COPY motd /etc/motd COPY .bashrc /app/.bashrc ENV ENV=/app/.bashrc -RUN curl -L https://github.com/smarthome-go/cli/releases/download/v2.0.3-beta/homescript_linux_amd64.tar.gz -o /tmp/homescript.tar.gz +RUN curl -L https://github.com/smarthome-go/cli/releases/download/v2.3.0-beta/homescript_linux_amd64.tar.gz -o /tmp/homescript.tar.gz WORKDIR /bin RUN tar -xvf /tmp/homescript.tar.gz && chmod +x /bin/homescript && rm -rf /tmp/homescript.tar.gz diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4f61df31..5bea1ad7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.7' services: smarthome: - image: mikmuellerdev/smarthome:0.0.29-beta + image: mikmuellerdev/smarthome:0.0.29 container_name: smarthome hostname: smarthome depends_on: diff --git a/docker/motd b/docker/motd index be1bce75..e5370221 100644 --- a/docker/motd +++ b/docker/motd @@ -1,6 +1,6 @@ ######## Smarthome: A completely self-built Smarthome-system written in Go ### ### Issues : https://github.com/smarthome-go/smarthome/issues - ### ### Version : 0.0.29-beta + ### ### Version : 0.0.29 ### ### ### ### |# #########@ | diff --git a/main.go b/main.go index 5059fb61..1a5b3c24 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ var port = 8082 // Default port on which the server listens, can be overwritten func main() { // Do not change manually, use the `make version` command instead - utils.Version = "0.0.29-beta" + utils.Version = "0.0.29" startTime := time.Now() diff --git a/web/package-lock.json b/web/package-lock.json index b26c0ea3..9733fa9b 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "smarthome-web", - "version": "0.0.29-beta", + "version": "0.0.29", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "smarthome-web", - "version": "0.0.29-beta", + "version": "0.0.29", "license": "GPL-2.0-only", "dependencies": { "@smui/button": "^6.0.0-beta.15", diff --git a/web/package.json b/web/package.json index 886bcd0a..9b8e2ac4 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "smarthome-web", - "version": "0.0.29-beta", + "version": "0.0.29", "description": "Web interface for Smarthome", "author": "MikMuellerDev", "contributors": [