prepare for 1.1.4

CHANGELOG

+1.1.4
+-----
+* Add stackmaxima versions 2021010100, 2021120900
+* Add `HEALTHCHECK` to Dockerfile
+* Add docker-compose.yml
+* Update dependencies
+
 1.1.3
 -----
 * Fix bug where occasionally under load, timeouts would return error 500 instead of 416

README.md

@@ -30,14 +30,22 @@ Using the Docker Image
 
 The prebuilt docker images are available from the docker hub at `mathinstitut/goemaxima:[version]-latest`.
 
-The port of the server in the container is `8080` and the path that has to be input into stack is `http://[address:port]/goemaxima`.
+They can be simply run with docker-compose in the top-directory of the repository (setting the `STACKMAXIMA_VERSION` to the desired value):
+```
+export STACKMAXIMA_VERSION=...
+docker-compose up -d
+```
+The container should then be available on port 8080 (from outside the host too, keep this behind a firewall so it is not reachable from the general internet).
+
+The port of the server inside the container is `8080` and the path that has to be input into stack is `http://[address:port]/goemaxima`.
 Some older versions of the image accept only `http://[address:port]/maxima` and this url should work in newer versions as well.
 
-You can the image with
+If you do not wish to use the docker-compose configuration, you can also run the image with
 ```
-$ docker run --restart=always --tmpfs /tmp -p $port:8080 $imagename
+$ docker run --restart=always --tmpfs /tmp -p $address:$port:8080 $imagename
 ```
-where `$port` is the port you want to make the service available on and `$imagename` is the name of the docker image you chose (e.g. `mathinstitut/goemaxima:2020120600-latest`).
+where `$address:$port` is the ip and port you want to make the service available on and `$imagename` is the name of the docker image you chose (e.g. `mathinstitut/goemaxima:2020120600-latest`).
+Use `0.0.0.0` as address to listen to all addresses.
 
 Note that this program prefers to quit on errors it can not recover from, so setting `restart=always` is strongly recommended.
 

docker-compose.yml

 version: "3.9"
 services:
   maxima:
-    image: goemaxima:${STACKMAXIMA_VERSION:-2021120900}-dev
+    image: mathinstitut/goemaxima:${STACKMAXIMA_VERSION:-2021120900}-latest
     ports:
-      - 8765:8080
+      - 0.0.0.0:8080:8080
     tmpfs:
       - "/tmp"
     restart: unless-stopped

goemaxima_version

-1.1.3
+1.1.4

src/web/go.mod

@@ -3,8 +3,12 @@ module web
 go 1.15
 
 require (
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/go-kit/kit v0.10.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/prometheus/client_golang v1.10.0
-	github.com/prometheus/common v0.23.0 // indirect
-	golang.org/x/sys v0.0.0-20210507014357-30e306a8bba5 // indirect
+	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 )

src/web/web.go

@@ -250,7 +250,7 @@ func handler(w http.ResponseWriter, r *http.Request, queue <-chan *ChildProcess,
 	health := r.FormValue("health") == "1"
 	if r.Method == "GET" && r.FormValue("input") == "" && !health {
 		hostname, _ := os.Hostname()
-		fmt.Fprintf(w, "Hostname: %s, version: 1.1.3\n", hostname)
+		fmt.Fprintf(w, "Hostname: %s, version: 1.1.4\n", hostname)
 		return
 	}
 	// the maxima input to be evaluated