diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index 0ec66b9bd..e0052f0e8 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -21,7 +21,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Run python tests run: | - docker pull twosixarmory/tf1:0.3.1 + docker pull twosixarmory/tf1:0.3.2 pip install -r requirements.txt pip install -r test-requirements.txt pytest -s --disable-warnings diff --git a/Dockerfile b/Dockerfile index 7487e7394..54d1d1756 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Armory Containers v0.3.1 +# Armory Containers v0.3.2 ########## Base ################# @@ -27,14 +27,14 @@ WORKDIR /workspace FROM armory-base AS armory-tf1 RUN /opt/conda/bin/conda install tensorflow==1.15.0 -RUN /opt/conda/bin/pip install armory-testbed==0.3.1 +RUN /opt/conda/bin/pip install armory-testbed==0.3.2 CMD tail -f /dev/null ########## TF 2.1 ################# FROM armory-base AS armory-tf2 RUN /opt/conda/bin/pip install tensorflow==2.1.0 -RUN /opt/conda/bin/pip install armory-testbed==0.3.1 +RUN /opt/conda/bin/pip install armory-testbed==0.3.2 CMD tail -f /dev/null ########## PyTorch 1.4 ################# @@ -43,7 +43,7 @@ CMD tail -f /dev/null FROM armory-tf1 AS armory-pytorch RUN /opt/conda/bin/conda install pytorch==1.4 torchvision cudatoolkit=10.1 -c pytorch -RUN /opt/conda/bin/pip install armory-testbed==0.3.1 +RUN /opt/conda/bin/pip install armory-testbed==0.3.2 CMD tail -f /dev/null ##################################### \ No newline at end of file diff --git a/README.md b/README.md index baa415aee..caf9fefb8 100644 --- a/README.md +++ b/README.md @@ -63,17 +63,17 @@ Armory is intended to be a lightweight python package which standardizes all eva inside a docker container. Users are encouraged to use the available images on dockerhub: ``` -docker pull twosixarmory/tf1:0.3.1 -docker pull twosixarmory/tf2:0.3.1 -docker pull twosixarmory/pytorch:0.3.1 +docker pull twosixarmory/tf1:0.3.2 +docker pull twosixarmory/tf2:0.3.2 +docker pull twosixarmory/pytorch:0.3.2 ``` However if there are issues downloading the images (e.g. proxy) they can be built within this repo: ``` -docker build --target armory-tf1 -t twosixarmory/tf1:0.3.1 . -docker build --target armory-tf2 -t twosixarmory/tf2:0.3.1 . -docker build --target armory-pytorch -t twosixarmory/pytorch:0.3.1 . +docker build --target armory-tf1 -t twosixarmory/tf1:0.3.2 . +docker build --target armory-tf2 -t twosixarmory/tf2:0.3.2 . +docker build --target armory-pytorch -t twosixarmory/pytorch:0.3.2 . ``` ### Docker Mounts diff --git a/armory/__init__.py b/armory/__init__.py index dfd4ce1e9..36c305580 100644 --- a/armory/__init__.py +++ b/armory/__init__.py @@ -14,4 +14,4 @@ from armory import paths # Semantic Version -__version__ = "0.3.1" +__version__ = "0.3.2" diff --git a/armory/__main__.py b/armory/__main__.py index e6b62a813..0fb362f51 100644 --- a/armory/__main__.py +++ b/armory/__main__.py @@ -123,9 +123,9 @@ def download_all_data(command_args, prog, description): print("Downloading all docker images....") docker_client = docker.from_env() docker_images = [ - "twosixarmory/tf1:0.3.1", - "twosixarmory/tf2:0.3.1", - "twosixarmory/pytorch:0.3.1", + "twosixarmory/tf1:0.3.2", + "twosixarmory/tf2:0.3.2", + "twosixarmory/pytorch:0.3.2", ] for image in docker_images: try: @@ -135,7 +135,7 @@ def download_all_data(command_args, prog, description): docker_client.images.pull(image) print("Downloading all datasets and model weights...") - manager = ManagementInstance(image_name="twosixarmory/tf1:0.3.1") + manager = ManagementInstance(image_name="twosixarmory/tf1:0.3.2") runner = manager.start_armory_instance() cmd = "; ".join( [ diff --git a/examples/backdoor_poisoning.json b/examples/backdoor_poisoning.json index dfcb40e89..28383b52b 100644 --- a/examples/backdoor_poisoning.json +++ b/examples/backdoor_poisoning.json @@ -42,7 +42,7 @@ "wrapper_kwargs": {} }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/examples/carlini_wagner_l2_targeted.json b/examples/carlini_wagner_l2_targeted.json index 6855ad063..47991d64f 100644 --- a/examples/carlini_wagner_l2_targeted.json +++ b/examples/carlini_wagner_l2_targeted.json @@ -34,7 +34,7 @@ "wrapper_kwargs": {} }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/examples/carlini_wagner_linf_targeted.json b/examples/carlini_wagner_linf_targeted.json index 79613a910..469d06b24 100644 --- a/examples/carlini_wagner_linf_targeted.json +++ b/examples/carlini_wagner_linf_targeted.json @@ -34,7 +34,7 @@ "wrapper_kwargs": {} }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/examples/fgm_attack.json b/examples/fgm_attack.json index 8b0ec22a5..77c8125ef 100644 --- a/examples/fgm_attack.json +++ b/examples/fgm_attack.json @@ -32,7 +32,7 @@ } }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/examples/fgm_attack_binary_search.json b/examples/fgm_attack_binary_search.json index 2710d79c5..dc619555a 100644 --- a/examples/fgm_attack_binary_search.json +++ b/examples/fgm_attack_binary_search.json @@ -39,7 +39,7 @@ } }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/examples/transfer_attack.json b/examples/transfer_attack.json index 4e514867e..06ad9d6b7 100644 --- a/examples/transfer_attack.json +++ b/examples/transfer_attack.json @@ -18,7 +18,7 @@ "wrapper_kwargs": {} }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/examples/transform_defense.json b/examples/transform_defense.json index e2b61b01d..5f74958a7 100644 --- a/examples/transform_defense.json +++ b/examples/transform_defense.json @@ -28,7 +28,7 @@ } }, "sysconfig": { - "docker_image": "twosixarmory/pytorch:0.3.1", + "docker_image": "twosixarmory/pytorch:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/tests/test_data/missing_eval.json b/tests/test_data/missing_eval.json index 6724df3ed..ca67c3eef 100644 --- a/tests/test_data/missing_eval.json +++ b/tests/test_data/missing_eval.json @@ -25,7 +25,7 @@ "wrapper_kwargs": {} }, "sysconfig": { - "docker_image": "twosixarmory/tf1:0.3.1", + "docker_image": "twosixarmory/tf1:0.3.2", "external_github_repo": null, "use_gpu": false } diff --git a/tests/test_docker_management.py b/tests/test_docker_management.py index fb750c278..0bb295615 100644 --- a/tests/test_docker_management.py +++ b/tests/test_docker_management.py @@ -9,13 +9,13 @@ class ContainerTest(unittest.TestCase): def test_creation(self): - manager = ManagementInstance(image_name="twosixarmory/tf1:0.3.1") + manager = ManagementInstance(image_name="twosixarmory/tf1:0.3.2") instance = manager.start_armory_instance() self.assertIsInstance(instance.docker_container, Container) self.assertIn(instance.docker_container.short_id, manager.instances) def test_deletion(self): - manager = ManagementInstance(image_name="twosixarmory/tf1:0.3.1") + manager = ManagementInstance(image_name="twosixarmory/tf1:0.3.2") instance = manager.start_armory_instance() manager.stop_armory_instance(instance) self.assertEqual(manager.instances, {})