Merge pull request #60 from rust-math/update-container

Container with Rust 1.49, and move to GitHub Container Registry

Author: termoshtt

CHANGELOG.md

@@ -1,3 +1,10 @@
+Unreleased
+-----------
+
+### Changed
+
+- Repository of container image has been moved to GitHub Container Registry (ghcr.io) from DockerHub https://github.com/rust-math/intel-mkl-src/pull/60
+
 0.6.0+mkl2020.1 - 2020-06-23
 =============================
 

docker/Makefile

@@ -1,28 +1,23 @@
-REGISTRY     := rustmath
-RUST_VERSION := 1.43.0
+TARGETS := rust ubuntu centos
 
-all: test ubuntu centos
+all: build
+build: $(foreach TARGET,$(TARGETS),build/$(TARGET))
+push:  $(foreach TARGET,$(TARGETS),push/$(TARGET))
 
-build:
-	docker build .                               \
-		--build-arg "RUST_VERSION=$(RUST_VERSION)" \
-		-t $(REGISTRY)/mkl-rust:$(RUST_VERSION)
+build/rust:
+	$(MAKE) -f rust.mk build
 
-push: build ubuntu centos
-	docker push $(REGISTRY)/mkl-rust:$(RUST_VERSION)
-	docker push $(REGISTRY)/mkl-centos:$(RUST_VERSION)
-	docker push $(REGISTRY)/mkl-ubuntu:$(RUST_VERSION)
+build/ubuntu:
+	$(MAKE) -f ubuntu.mk build
 
-test: build
-	docker run -it --rm $(REGISTRY)/mkl-rust:$(RUST_VERSION) pkg-config --libs mkl-dynamic-lp64-iomp
-	docker run -it --rm $(REGISTRY)/mkl-rust:$(RUST_VERSION) ldconfig -p | grep mkl
+build/centos:
+	$(MAKE) -f centos.mk build
 
-ubuntu:
-	docker build . -f $@.Dockerfile              \
-		--build-arg "RUST_VERSION=$(RUST_VERSION)" \
-		-t $(REGISTRY)/mkl-ubuntu:$(RUST_VERSION)
+push/rust: build/rust
+	$(MAKE) -f rust.mk push
 
-centos:
-	docker build . -f $@.Dockerfile              \
-		--build-arg "RUST_VERSION=$(RUST_VERSION)" \
-		-t $(REGISTRY)/mkl-centos:$(RUST_VERSION)
+push/ubuntu: build/ubuntu
+	$(MAKE) -f ubuntu.mk push
+
+push/centos: build/centos
+	$(MAKE) -f centos.mk push

docker/centos.mk

@@ -0,0 +1,3 @@
+HERE   := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+TARGET := mkl-centos
+include $(HERE)/common.mk

docker/common.mk

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

docker/centos.Dockerfile renamed to docker/mkl-centos.Dockerfile

@@ -0,0 +1,3 @@
+HERE   := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+TARGET := mkl-rust
+include $(HERE)/common.mk

docker/Dockerfile renamed to docker/mkl-rust.Dockerfile

@@ -0,0 +1,3 @@
+HERE   := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+TARGET := mkl-ubuntu
+include $(HERE)/common.mk

docker/ubuntu.Dockerfile renamed to docker/mkl-ubuntu.Dockerfile

@@ -1,18 +1,19 @@
 HERE          := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-RUST_VERSION  := 1.43.0
+REGISTRY      := ghcr.io/rust-math/intel-mkl-src
+RUST_VERSION  := 1.49.0
 DOCKER_OPTION := --rm -u $(shell id -u):$(shell id -g) -v $(HERE):/src
 
 test:
-	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache rustmath/mkl-rust:$(RUST_VERSION) cargo test with_mkl -- --ignored
+	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache $(REGISTRY)/mkl-rust:$(RUST_VERSION) cargo test with_mkl -- --ignored
 
 seek:
-	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache rustmath/mkl-rust:$(RUST_VERSION) cargo run --release -- seek
+	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache $(REGISTRY)/mkl-rust:$(RUST_VERSION) cargo run --release -- seek
 
 package:
-	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache rustmath/mkl-rust:$(RUST_VERSION) cargo run --release -- package
+	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache $(REGISTRY)/mkl-rust:$(RUST_VERSION) cargo run --release -- package
 
 seek-ubuntu:
-	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-ubuntu rustmath/mkl-ubuntu:$(RUST_VERSION) cargo run --release -- seek
+	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-ubuntu $(REGISTRY)/mkl-ubuntu:$(RUST_VERSION) cargo run --release -- seek
 
 seek-centos:
-	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-centos rustmath/mkl-centos:$(RUST_VERSION) cargo run --release -- seek
+	docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-centos $(REGISTRY)/mkl-centos:$(RUST_VERSION) cargo run --release -- seek