Merge remote-tracking branch 'origin/master' into dp-dockerfile

This commit is contained in:
David Palm
2021-03-26 12:28:41 +01:00
+5
View File
@@ -1,6 +1,11 @@
#### BUILDER IMAGE -- quite big one ####
<<<<<<< HEAD
FROM paritytech/musl-ci-linux as builder
LABEL maintainer="Parity Technologies"
=======
FROM paritytech/ci-linux:production as builder
LABEL maintainer="Daniel Maricic daniel@woss.io"
>>>>>>> origin/master
LABEL description="Polkadot Telemetry backend builder image"
ARG PROFILE=release