fix minor docker makefile targets

crossbario · Dec 15, 2020 · c08e9e3 · c08e9e3
1 parent cd3c4d8
commit c08e9e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/docker/aarch64/Makefile b/docker/aarch64/Makefile
@@ -54,14 +54,14 @@ os_version:
 
 python_version:
 	docker run -it --rm crossbario/autobahn-python-aarch64:cpy3 python -V
-	docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 python -V
+	docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 pypy3 -V
 	#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-alpine python -V
 	#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-aio python -V
 	#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-tx python -V
 
 autobahn_version:
 	docker run -it --rm crossbario/autobahn-python-aarch64:cpy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
-	docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
+	docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 pypy3 -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 	#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-alpine python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 	#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-aio python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 	#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-tx python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"

diff --git a/docker/x86_64/Makefile b/docker/x86_64/Makefile
@@ -5,6 +5,7 @@ build:
 		--build-arg BUILD_DATE=${BUILD_DATE} \
 		--build-arg AUTOBAHN_PYTHON_VCS_REF=${AUTOBAHN_PYTHON_VCS_REF} \
 		--build-arg AUTOBAHN_PYTHON_VERSION=${AUTOBAHN_PYTHON_VERSION} \
+	 	-t crossbario/autobahn-python:latest \
 		-t crossbario/autobahn-python:cpy3 \
 		-t crossbario/autobahn-python:cpy3-${AUTOBAHN_PYTHON_VERSION} \
 		-f Dockerfile.cpy3 .
@@ -21,7 +22,6 @@ build:
 	# 	--build-arg BUILD_DATE=${BUILD_DATE} \
 	# 	--build-arg AUTOBAHN_PYTHON_VCS_REF=${AUTOBAHN_PYTHON_VCS_REF} \
 	# 	--build-arg AUTOBAHN_PYTHON_VERSION=${AUTOBAHN_PYTHON_VERSION} \
-	# 	-t crossbario/autobahn-python:latest \
 	# 	-t crossbario/autobahn-python:cpy3-alpine \
 	# 	-t crossbario/autobahn-python:cpy3-alpine-${AUTOBAHN_PYTHON_VERSION} \
 	# 	-f Dockerfile.cpy3-alpine .
@@ -46,22 +46,22 @@ version: python_version autobahn_version xbr_version
 
 python_version:
 	docker run -it --rm crossbario/autobahn-python:cpy3 python -V
-	docker run -it --rm crossbario/autobahn-python:pypy3 python -V
+	docker run -it --rm crossbario/autobahn-python:pypy3 pypy3 -V
 	# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -V
 	# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-aio python -V
 	# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-tx python -V
 
 autobahn_version:
 	docker run -it --rm crossbario/autobahn-python:cpy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
-	docker run -it --rm crossbario/autobahn-python:pypy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
+	docker run -it --rm crossbario/autobahn-python:pypy3 pypy3 -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 	# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 	# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-aio python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 	# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-tx python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
 
 xbr_version:
-	docker run -it --rm crossbario/autobahn-python:cpy3 python -c "from autobahn import xbr; print(xbr.network.address)"
-	docker run -it --rm crossbario/autobahn-python:pypy3 python -c "from autobahn import xbr; print(xbr.network.address)"
-	# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -c "from autobahn import xbr; print(xbr.network.address)"
+	docker run -it --rm crossbario/autobahn-python:cpy3 python -c "from autobahn import xbr; print(xbr.HAS_XBR)"
+	docker run -it --rm crossbario/autobahn-python:pypy3 pypy3 -c "from autobahn import xbr; print(xbr.HAS_XBR)"
+	# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -c "from autobahn import xbr; print(xbr.HAS_XBR)"
 
 
 test: test_cpy3 test_pypy3 test_cpy3_alpine test_cpy3_minimal_aio test_cpy3_minimal_tx