Skip to content

Commit c08e9e3

Browse files
committedDec 15, 2020
fix minor docker makefile targets
1 parent cd3c4d8 commit c08e9e3

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
 

‎docker/aarch64/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ os_version:
5454

5555
python_version:
5656
docker run -it --rm crossbario/autobahn-python-aarch64:cpy3 python -V
57-
docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 python -V
57+
docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 pypy3 -V
5858
#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-alpine python -V
5959
#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-aio python -V
6060
#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-tx python -V
6161

6262
autobahn_version:
6363
docker run -it --rm crossbario/autobahn-python-aarch64:cpy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
64-
docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
64+
docker run -it --rm crossbario/autobahn-python-aarch64:pypy3 pypy3 -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
6565
#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-alpine python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
6666
#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-aio python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
6767
#docker run -it --rm crossbario/autobahn-python-aarch64:cpy3-minimal-tx python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"

‎docker/x86_64/Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build:
55
--build-arg BUILD_DATE=${BUILD_DATE} \
66
--build-arg AUTOBAHN_PYTHON_VCS_REF=${AUTOBAHN_PYTHON_VCS_REF} \
77
--build-arg AUTOBAHN_PYTHON_VERSION=${AUTOBAHN_PYTHON_VERSION} \
8+
-t crossbario/autobahn-python:latest \
89
-t crossbario/autobahn-python:cpy3 \
910
-t crossbario/autobahn-python:cpy3-${AUTOBAHN_PYTHON_VERSION} \
1011
-f Dockerfile.cpy3 .
@@ -21,7 +22,6 @@ build:
2122
# --build-arg BUILD_DATE=${BUILD_DATE} \
2223
# --build-arg AUTOBAHN_PYTHON_VCS_REF=${AUTOBAHN_PYTHON_VCS_REF} \
2324
# --build-arg AUTOBAHN_PYTHON_VERSION=${AUTOBAHN_PYTHON_VERSION} \
24-
# -t crossbario/autobahn-python:latest \
2525
# -t crossbario/autobahn-python:cpy3-alpine \
2626
# -t crossbario/autobahn-python:cpy3-alpine-${AUTOBAHN_PYTHON_VERSION} \
2727
# -f Dockerfile.cpy3-alpine .
@@ -46,22 +46,22 @@ version: python_version autobahn_version xbr_version
4646

4747
python_version:
4848
docker run -it --rm crossbario/autobahn-python:cpy3 python -V
49-
docker run -it --rm crossbario/autobahn-python:pypy3 python -V
49+
docker run -it --rm crossbario/autobahn-python:pypy3 pypy3 -V
5050
# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -V
5151
# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-aio python -V
5252
# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-tx python -V
5353

5454
autobahn_version:
5555
docker run -it --rm crossbario/autobahn-python:cpy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
56-
docker run -it --rm crossbario/autobahn-python:pypy3 python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
56+
docker run -it --rm crossbario/autobahn-python:pypy3 pypy3 -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
5757
# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
5858
# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-aio python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
5959
# docker run -it --rm crossbario/autobahn-python:cpy3-minimal-tx python -c "import autobahn; print('running autobahn-{}'.format(autobahn.__version__))"
6060

6161
xbr_version:
62-
docker run -it --rm crossbario/autobahn-python:cpy3 python -c "from autobahn import xbr; print(xbr.network.address)"
63-
docker run -it --rm crossbario/autobahn-python:pypy3 python -c "from autobahn import xbr; print(xbr.network.address)"
64-
# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -c "from autobahn import xbr; print(xbr.network.address)"
62+
docker run -it --rm crossbario/autobahn-python:cpy3 python -c "from autobahn import xbr; print(xbr.HAS_XBR)"
63+
docker run -it --rm crossbario/autobahn-python:pypy3 pypy3 -c "from autobahn import xbr; print(xbr.HAS_XBR)"
64+
# docker run -it --rm crossbario/autobahn-python:cpy3-alpine python -c "from autobahn import xbr; print(xbr.HAS_XBR)"
6565

6666

6767
test: test_cpy3 test_pypy3 test_cpy3_alpine test_cpy3_minimal_aio test_cpy3_minimal_tx

0 commit comments

Comments
 (0)
Please sign in to comment.