Upgrade to GHC 8.10 and use Ubuntu 20.04 as base image for haskell docker images

Makefile

@@ -190,39 +190,39 @@ i-%:
 .PHONY: docker-prebuilder
 docker-prebuilder:
 	# `docker-prebuilder` needs to be built or pulled only once (unless native dependencies change)
-	$(MAKE) -C build/alpine prebuilder
+	$(MAKE) -C build/ubuntu prebuilder
 
 .PHONY: docker-deps
 docker-deps:
 	# `docker-deps` needs to be built or pulled only once (unless native dependencies change)
-	$(MAKE) -C build/alpine deps
+	$(MAKE) -C build/ubuntu deps
 
 .PHONY: docker-builder
 docker-builder:
 	# `docker-builder` needs to be built or pulled only once (unless native dependencies change)
-	$(MAKE) -C build/alpine builder
+	$(MAKE) -C build/ubuntu builder
 
 .PHONY: docker-intermediate
 docker-intermediate:
 	# `docker-intermediate` needs to be built whenever code changes - this essentially runs `stack clean && stack install` on the whole repo
-	docker build -t $(DOCKER_USER)/alpine-intermediate:$(DOCKER_TAG) -f build/alpine/Dockerfile.intermediate --build-arg builder=$(DOCKER_USER)/alpine-builder:develop --build-arg deps=$(DOCKER_USER)/alpine-deps:develop .;
-	docker tag $(DOCKER_USER)/alpine-intermediate:$(DOCKER_TAG) $(DOCKER_USER)/alpine-intermediate:latest;
-	if test -n "$$DOCKER_PUSH"; then docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD); docker push $(DOCKER_USER)/alpine-intermediate:$(DOCKER_TAG); docker push $(DOCKER_USER)/alpine-intermediate:latest; fi;
+	docker build -t $(DOCKER_USER)/ubuntu20-intermediate:$(DOCKER_TAG) -f build/ubuntu/Dockerfile.intermediate --build-arg builder=$(DOCKER_USER)/ubuntu20-builder:develop --build-arg deps=$(DOCKER_USER)/ubuntu20-deps:develop .;
+	docker tag $(DOCKER_USER)/ubuntu20-intermediate:$(DOCKER_TAG) $(DOCKER_USER)/ubuntu20-intermediate:latest;
+	if test -n "$$DOCKER_PUSH"; then docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD); docker push $(DOCKER_USER)/ubuntu20-intermediate:$(DOCKER_TAG); docker push $(DOCKER_USER)/ubuntu20-intermediate:latest; fi;
 
 .PHONY: docker-exe-%
 docker-exe-%:
-	docker image ls | grep $(DOCKER_USER)/alpine-deps > /dev/null || (echo "'make docker-deps' required.", exit 1)
-	docker image ls | grep $(DOCKER_USER)/alpine-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1)
-	docker build -t $(DOCKER_USER)/"$*":$(DOCKER_TAG) -f build/alpine/Dockerfile.executable --build-arg executable="$*" --build-arg intermediate=$(DOCKER_USER)/alpine-intermediate --build-arg deps=$(DOCKER_USER)/alpine-deps .
+	docker image ls | grep $(DOCKER_USER)/ubuntu20-deps > /dev/null || (echo "'make docker-deps' required.", exit 1)
+	docker image ls | grep $(DOCKER_USER)/ubuntu20-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1)
+	docker build -t $(DOCKER_USER)/"$*":$(DOCKER_TAG) -f build/ubuntu/Dockerfile.executable --build-arg executable="$*" --build-arg intermediate=$(DOCKER_USER)/ubuntu20-intermediate --build-arg deps=$(DOCKER_USER)/ubuntu20-deps .
 	docker tag $(DOCKER_USER)/"$*":$(DOCKER_TAG) $(DOCKER_USER)/"$*":latest
 	if test -n "$$DOCKER_PUSH"; then docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD); docker push $(DOCKER_USER)/"$*":$(DOCKER_TAG); docker push $(DOCKER_USER)/"$*":latest; fi;
 
 .PHONY: docker-services
 docker-services:
 	# make docker-services doesn't compile, only makes small images out of the `docker-intermediate` image
 	# to recompile, run `docker-intermediate` first.
-	docker image ls | grep $(DOCKER_USER)/alpine-deps > /dev/null || (echo "'make docker-deps' required.", exit 1)
-	docker image ls | grep $(DOCKER_USER)/alpine-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1)
+	docker image ls | grep $(DOCKER_USER)/ubuntu20-deps > /dev/null || (echo "'make docker-deps' required.", exit 1)
+	docker image ls | grep $(DOCKER_USER)/ubuntu20-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1)
 	# `make -C services/brig docker` == `make docker-exe-brig docker-exe-brig-integration docker-exe-brig-schema docker-exe-brig-index`
 	$(MAKE) -C services/brig docker
 	$(MAKE) -C services/gundeck docker
@@ -236,10 +236,10 @@ docker-services:
 
 DOCKER_DEV_NETWORK := --net=host
 DOCKER_DEV_VOLUMES := -v `pwd`:/wire-server
-DOCKER_DEV_IMAGE   := quay.io/wire/alpine-builder:$(DOCKER_TAG)
+DOCKER_DEV_IMAGE   := quay.io/wire/ubuntu20-builder:$(DOCKER_TAG)
 .PHONY: run-docker-builder
 run-docker-builder:
-	@echo "if this does not work, consider 'docker pull', 'docker tag', or 'make -C build-alpine builder'."
+	@echo "if this does not work, consider 'docker pull', 'docker tag', or 'make -C build/ubuntu builder'."
 	docker run --workdir /wire-server -it $(DOCKER_DEV_NETWORK) $(DOCKER_DEV_VOLUMES) --rm $(DOCKER_DEV_IMAGE) /bin/bash
 
 .PHONY: git-add-cassandra-schema

README.md

@@ -108,22 +108,22 @@ For building nginz, see [services/nginz/README.md](services/nginz/README.md)
 
 #### 2. Use docker
 
-*If you don't wish to build all docker images from scratch (e.g. the `alpine-builder` takes a very long time), ready-built images can be downloaded from [here](https://quay.io/organization/wire).*
+*If you don't wish to build all docker images from scratch (e.g. the `ubuntu20-builder` takes a very long time), ready-built images can be downloaded from [here](https://quay.io/organization/wire).*
 
 If you wish to build your own docker images, you need [docker version >= 17.05](https://www.docker.com/) and [`make`](https://www.gnu.org/software/make/). Then,
 
 ```bash
 # optionally:
-# make docker-builder # if you don't run this, it pulls the alpine-builder image from quay.io
+# make docker-builder # if you don't run this, it pulls the ubuntu20-builder image from quay.io
 make docker-deps docker-intermediate docker-services
 
 # subsequent times, after changing code, if you wish to re-create docker images, it's sufficient to
 make docker-intermediate docker-services
 ```
 
-will, eventually, have built a range of docker images. Make sure to [give Docker enough RAM](https://github.com/wireapp/wire-server/issues/562); if you see `make: *** [builder] Error 137`, it might be a sign that the build ran out of memory. You can also mix and match – e.g. pull the [`alpine-builder`](https://quay.io/repository/wire/alpine-builder?tab=tags) image and build the rest locally.
+will, eventually, have built a range of docker images. Make sure to [give Docker enough RAM](https://github.com/wireapp/wire-server/issues/562); if you see `make: *** [builder] Error 137`, it might be a sign that the build ran out of memory. You can also mix and match – e.g. pull the [`ubuntu20-builder`](https://quay.io/repository/wire/ubuntu20-builder?tab=tags) image and build the rest locally.
 
-See the `Makefile`s and `Dockerfile`s, as well as [build/alpine/README.md](build/alpine/README.md) for details.
+See the `Makefile`s and `Dockerfile`s, as well as [build/ubuntu/README.md](build/ubuntu/README.md) for details.
 
 ### How to run integration tests
 

build/alpine/Dockerfile.builder → build/ubuntu/Dockerfile.builder

@@ -1,5 +1,4 @@
-# Requires docker >= 17.05 (requires support for multi-stage builds)
-ARG prebuilder=quay.io/wire/alpine-prebuilder
+ARG prebuilder=quay.io/wire/ubuntu20-prebuilder
 
 FROM ${prebuilder}
 WORKDIR /
@@ -18,9 +17,9 @@ RUN set -x && \
     cd /wire-server && \
     stack update && \
     echo "allow-different-user: true" >> /root/.stack/config.yaml && \
-    stack build --haddock --dependencies-only haskell-src-exts && \
-    stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \
-    stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \
+    stack build --dependencies-only haskell-src-exts && \
+    stack build haskell-src-exts && \
+    stack build --pedantic --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \
     stack install ormolu && \
     cd / && \
     # we run the build only to cache the built source in /root/.stack, we can remove the source code itself

build/ubuntu/Dockerfile.deps

@@ -0,0 +1,33 @@
+FROM ubuntu:20.04 as cryptobox-builder
+
+# compile cryptobox-c
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && \
+    apt-get install -y cargo file libsodium-dev git pkg-config && \
+    cd /tmp && \
+    git clone https://github.com/wireapp/cryptobox-c.git && \
+    cd cryptobox-c && \
+    export SODIUM_USE_PKG_CONFIG=1 && \
+    cargo build --release
+
+# Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services
+FROM ubuntu:20.04
+
+COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && \
+    apt-get install -y \
+            libsodium23 \
+            libssl1.1 \
+            libgmp10 \
+            libffi7 \
+            libicu66 \
+            geoip-database \
+            ca-certificates \
+            dumb-init \
+            libxml2 \
+            libncurses6 \
+            zlib1g \
+            netbase && \
+    rm -rf /var/lib/apt/lists/*

build/alpine/Dockerfile.executable → build/ubuntu/Dockerfile.executable

@@ -4,10 +4,9 @@
 # Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory)
 # Usage example:
 #   (from wire-server root directory)
-#   export EXECUTABLE=galley-schema; docker build -t $EXECUTABLE -f build/alpine/Dockerfile.executable --build-arg executable=$EXECUTABLE .
-
-ARG intermediate=quay.io/wire/alpine-intermediate
-ARG deps=quay.io/wire/alpine-deps
+#   export EXECUTABLE=galley-schema; docker build -t $EXECUTABLE -f build/ubuntu/Dockerfile.executable --build-arg executable=$EXECUTABLE .
+ARG intermediate=quay.io/wire/ubuntu20-intermediate
+ARG deps=quay.io/wire/ubuntu20-deps
 
 #--- Intermediate stage ---
 FROM ${intermediate} as intermediate

build/ubuntu/Dockerfile.fast-intermediate

@@ -0,0 +1,18 @@
+ARG builder=quay.io/wire/ubuntu20-builder
+ARG deps=quay.io/wire/ubuntu-deps
+
+#--- Builder stage ---
+FROM ${builder} as builder
+
+WORKDIR /wire-server/
+
+COPY . /wire-server/
+
+RUN make clean fast
+
+#--- Minified stage ---
+FROM ${deps}
+
+COPY --from=builder /wire-server/dist/ /dist/
+# brig also needs some templates.
+COPY --from=builder /wire-server/services/brig/deb/opt/brig/templates/ /dist/templates/

build/alpine/Dockerfile.intermediate → build/ubuntu/Dockerfile.intermediate

@@ -1,13 +1,12 @@
 # Produces intermediate docker image with all executables under /dist
 
-# Requires docker version >= 17.05 (requires support for multi-stage builds)
 # Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory)
 # Usage example:
 #   (from wire-server root directory)
-#   docker build -f build/alpine/Dockerfile.intermediate .
+#   docker build -f build/alpine/Dockerfile.intermediate
 
-ARG builder=quay.io/wire/alpine-builder
-ARG deps=quay.io/wire/alpine-deps
+ARG builder=quay.io/wire/ubuntu20-builder
+ARG deps=quay.io/wire/ubuntu20-deps
 
 #--- Builder stage ---
 FROM ${builder} as builder