Merge branch 'master' into rewrite-tool-entry

Author: termoshtt

docker/Makefile

@@ -1,4 +1,4 @@
-TARGETS := rust ubuntu centos
+TARGETS := rust ubuntu
 
 all: build
 build: $(foreach TARGET,$(TARGETS),build/$(TARGET))
@@ -10,14 +10,8 @@ build/rust:
 build/ubuntu:
 	$(MAKE) -f ubuntu.mk build
 
-build/centos:
-	$(MAKE) -f centos.mk build
-
 push/rust: build/rust
 	$(MAKE) -f rust.mk push
 
 push/ubuntu: build/ubuntu
 	$(MAKE) -f ubuntu.mk push
-
-push/centos: build/centos
-	$(MAKE) -f centos.mk push

docker/centos.mk

@@ -1,16 +1,17 @@
 TOP  := $(shell git rev-parse --show-toplevel)
 HERE := $(TOP)/docker
 
-REGISTRY     := ghcr.io/rust-math/intel-mkl-src
+REGISTRY := ghcr.io/rust-math/intel-mkl-src
 RUST_VERSION := 1.56.0
+PATCH_VERSION := 1
 
 all: build
 
 build:
 	docker build $(HERE)                         \
 		--build-arg "RUST_VERSION=$(RUST_VERSION)" \
-		-t $(REGISTRY)/$(TARGET):$(RUST_VERSION) \
+		-t $(REGISTRY)/$(TARGET):$(RUST_VERSION)-$(PATCH_VERSION) \
 		-f $(TARGET).Dockerfile
 
 push: build
-	docker push $(REGISTRY)/$(TARGET):$(RUST_VERSION)
+	docker push $(REGISTRY)/$(TARGET):$(RUST_VERSION)-$(PATCH_VERSION)

docker/common.mk

@@ -1,2 +1,4 @@
+/opt/intel/lib/intel64
+/opt/intel/lib/intel64_lin
 /opt/intel/mkl/lib/intel64
 /opt/intel/mkl/lib/intel64_lin

docker/intel-mkl.conf

@@ -26,7 +26,9 @@ RUN ldconfig
 ENV PKG_CONFIG_PATH /opt/intel/mkl/bin/pkgconfig
 RUN sed -i "s/MKLROOT/prefix/g" ${PKG_CONFIG_PATH}/*.pc
 
-# Setup basic rust development tools
 WORKDIR /src
+RUN chmod -R a+w /src
+
+# Setup basic rust development tools
 RUN cargo install cargo-tarpaulin
 RUN rustup component add rustfmt clippy

docker/mkl-centos.Dockerfile

@@ -1,36 +1,35 @@
-# Ubuntu with official apt install procedure
+# Ubuntu 20.04 with apt
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+# workaround for tzdata
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt update \
  && apt install -y \
       apt-utils \
       curl \
+      gcc \
       gnupg \
+      intel-mkl \
       libssl-dev \
       pkg-config \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
-# Install MKL
-# https://software.intel.com/content/www/us/en/develop/articles/installing-intel-free-libs-and-python-apt-repo.html
-RUN curl -sfL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB | apt-key add -
-RUN curl -sfL https://apt.repos.intel.com/setup/intelproducts.list -o /etc/apt/sources.list.d/intelproducts.list
-
-RUN apt update \
- && apt install -y intel-mkl-2020.0.088 \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
 # Setup Rust
 # From official setting in https://github.com/rust-lang/docker-rust
 ARG RUST_VERSION
 ENV RUSTUP_HOME=/usr/local/rustup
 ENV CARGO_HOME=/usr/local/cargo
 ENV PATH=/usr/local/cargo/bin:$PATH
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain ${RUST_VERSION}
-# this may concern security issue for production use, but this container is designed for development use.
-RUN chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 
 WORKDIR /src
-RUN chmod -R a+w /src
+
+# this may concern security issue for production use, but this container is designed for development use.
+RUN chmod -R a+w $RUSTUP_HOME $CARGO_HOME /src
+
+# Setup basic rust development tools
+RUN cargo install cargo-tarpaulin
+RUN rustup component add rustfmt clippy