From 09c136f6f3cde7ed6a750dec0ac73fcec03e9472 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Sat, 20 Feb 2021 15:49:00 +0100
Subject: First

---
 Makefile | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Makefile

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..51c3aa6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+all:
+
+tag=mytag
+
+pull:
+	docker pull  andreacensi/act4e:spring2021
+
+build:
+	docker build  -t $(tag) .
+
+
+check: build
+	docker run -it --rm $(tag) act4e-tests --module act4e_solutions
+
+
+check-%: build
+	docker run -it --rm $(tag) act4e-tests --module act4e_solutions --group $*
+
+#
+#check:
+#	docker run -it --rm -v $(PWD):$(PWD):ro -w $(PWD) andreacensi/act4e:spring2021 act4e-tests --module act4e_solutions
-- 
cgit v1.2.1


From 7ca1957d7539be03f9a93701278288bce488944c Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Sun, 21 Feb 2021 14:16:19 +0100
Subject: fix

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 51c3aa6..eb3bfd6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,18 +3,18 @@ all:
 tag=mytag
 
 pull:
-	docker pull  andreacensi/act4e:spring2021
+	docker pull andreacensi/act4e:spring2021
 
 build:
 	docker build  -t $(tag) .
 
 
 check: build
-	docker run -it --rm $(tag) act4e-tests --module act4e_solutions
+	docker run --rm $(tag) act4e-tests --module act4e_solutions
 
 
 check-%: build
-	docker run -it --rm $(tag) act4e-tests --module act4e_solutions --group $*
+	docker run --rm $(tag) act4e-tests --module act4e_solutions --group $*
 
 #
 #check:
-- 
cgit v1.2.1


From 68db9a00070a6926e947a64d76bf20289c2014f9 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Thu, 4 Mar 2021 15:48:57 +0100
Subject: fix

---
 Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index eb3bfd6..037ff7a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,17 +5,14 @@ tag=mytag
 pull:
 	docker pull andreacensi/act4e:spring2021
 
-build:
+build: pull
 	docker build  -t $(tag) .
 
 
 check: build
-	docker run --rm $(tag) act4e-tests --module act4e_solutions
+	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) act4e-tests --module act4e_solutions
 
 
 check-%: build
-	docker run --rm $(tag) act4e-tests --module act4e_solutions --group $*
+	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) act4e-tests --module act4e_solutions --group $*
 
-#
-#check:
-#	docker run -it --rm -v $(PWD):$(PWD):ro -w $(PWD) andreacensi/act4e:spring2021 act4e-tests --module act4e_solutions
-- 
cgit v1.2.1


From 738acb0c3ef00272f57cf960a5b79e1857464c78 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Sat, 16 Oct 2021 14:42:16 +0200
Subject: fix

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 037ff7a..cea6e06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 all:
 
+REGISTRY ?= reg-z7-prod.zuper.ai
+
 tag=mytag
 
 pull:
-	docker pull andreacensi/act4e:spring2021
+	docker pull ${REGISTRY}/act4e/act4e-tests:alphubel
 
 build: pull
-	docker build  -t $(tag) .
+	docker build -t $(tag) .
 
 
 check: build
-- 
cgit v1.2.1


From 7f96ed6e4536a8aec46ed6639d00682f0cb812e8 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Sun, 17 Oct 2021 11:51:04 +0200
Subject: [ci skip]

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cea6e06..598e600 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 all:
 
-REGISTRY ?= reg-z7-prod.zuper.ai
+DOCKER_REGISTRY ?= reg-z7-prod.zuper.ai
 
 tag=mytag
 
 pull:
-	docker pull ${REGISTRY}/act4e/act4e-tests:alphubel
+	docker pull ${DOCKER_REGISTRY}/act4e/act4e-tests:alphubel
 
 build: pull
 	docker build -t $(tag) .
-- 
cgit v1.2.1


From d12cc9f958fc0cef18bb9d2dd00e2aa7f97d9a2e Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Mon, 21 Feb 2022 11:20:26 +0100
Subject: fix

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 598e600..83fd1b8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ pull:
 	docker pull ${DOCKER_REGISTRY}/act4e/act4e-tests:alphubel
 
 build: pull
-	docker build -t $(tag) .
+	docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) .
 
 
 check: build
-- 
cgit v1.2.1


From e05f71320cf72cbad4d288514727b57979c7be22 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Mon, 21 Feb 2022 18:01:08 +0100
Subject: fix

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 83fd1b8..dfc1e28 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,11 @@ build: pull
 
 
 check: build
-	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) act4e-tests --module act4e_solutions
+	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
+		act4e-test --collections act4e_checks --module act4e_solutions
 
 
 check-%: build
-	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) act4e-tests --module act4e_solutions --group $*
+	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
+		act4e-test --collections act4e_checks --module act4e_solutions --group $*
 
-- 
cgit v1.2.1


From 337213bbd4431554e3ea9cb332b6a71da8080a14 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Mon, 21 Feb 2022 22:38:09 +0100
Subject: fix

---
 Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index dfc1e28..5177571 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,8 @@
 all:
 
-DOCKER_REGISTRY ?= reg-z7-prod.zuper.ai
-
 tag=mytag
 
-pull:
-	docker pull ${DOCKER_REGISTRY}/act4e/act4e-tests:alphubel
-
-build: pull
+build: 
 	docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) .
 
 
-- 
cgit v1.2.1


From 3f79a6e32d329531e99b05da5f83b4227f75fd2d Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Tue, 22 Feb 2022 13:38:05 +0100
Subject: fix

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5177571..0aca7d6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ tag=mytag
 build: 
 	docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) .
 
-
 check: build
 	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
 		act4e-test --collections act4e_checks --module act4e_solutions
@@ -15,3 +14,8 @@ check-%: build
 	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
 		act4e-test --collections act4e_checks --module act4e_solutions --group $*
 
+local-check:
+	act4e-test --collections act4e_checks --module act4e_solutions
+
+local-check-%:
+	act4e-test --collections act4e_checks --module act4e_solutions --group $*
\ No newline at end of file
-- 
cgit v1.2.1


From e2dd6011ad2abcec220220f14efdb451c986aea3 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Tue, 22 Feb 2022 13:54:04 +0100
Subject: fix

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0aca7d6..3090a59 100644
--- a/Makefile
+++ b/Makefile
@@ -5,17 +5,17 @@ tag=mytag
 build: 
 	docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) .
 
-check: build
+docker-check: build
 	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
 		act4e-test --collections act4e_checks --module act4e_solutions
 
 
-check-%: build
+docker-check-%: build
 	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
 		act4e-test --collections act4e_checks --module act4e_solutions --group $*
 
-local-check:
+check:
 	act4e-test --collections act4e_checks --module act4e_solutions
 
-local-check-%:
+check-%:
 	act4e-test --collections act4e_checks --module act4e_solutions --group $*
\ No newline at end of file
-- 
cgit v1.2.1


From 1987cc7f22a139fbd2ead1223ab878cddccd3f96 Mon Sep 17 00:00:00 2001
From: Andrea Censi <acensi@ethz.ch>
Date: Sun, 27 Feb 2022 13:07:33 +0100
Subject: fix

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3090a59..9c80517 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 all:
 
-tag=mytag
+tag=act4e-image
 
 build: 
-	docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) .
+	docker build -f .devcontainer/Dockerfile --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) .
 
 docker-check: build
 	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
@@ -14,8 +14,8 @@ docker-check-%: build
 	docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \
 		act4e-test --collections act4e_checks --module act4e_solutions --group $*
 
-check:
-	act4e-test --collections act4e_checks --module act4e_solutions
+# check:
+# 	act4e-test --collections act4e_checks --module act4e_solutions
 
-check-%:
-	act4e-test --collections act4e_checks --module act4e_solutions --group $*
\ No newline at end of file
+# check-%:
+# 	act4e-test --collections act4e_checks --module act4e_solutions --group $*
\ No newline at end of file
-- 
cgit v1.2.1