Remove docker mixin (#2889)

* update changelog

* fix

* remove docker mixin

* update scripts

* changelog

.devcontainer/Dockerfile

@@ -55,7 +55,6 @@ ARG PORTER_MIRROR=https://cdn.porter.sh
 ARG PORTER_VERSION=v0.38.13
 ARG PORTER_TERRAFORM_MIXIN_VERSION=v1.0.0-rc.1
 ARG PORTER_AZ_MIXIN_VERSION=v0.7.3
-ARG PORTER_DOCKER_MIXIN_VERSION=v0.3.0
 ARG PORTER_AZURE_PLUGIN_VERSION=v0.11.2
 ARG PORTER_HOME=/home/$USERNAME/.porter/
 COPY .devcontainer/scripts/porter.sh /tmp/

.devcontainer/devcontainer.json

@@ -266,6 +266,6 @@
   "forwardPorts": [
     8000
   ],
-  // Give permission to access docker socket
+  // Run commands after the container is created.
   "postCreateCommand": "./.devcontainer/scripts/post-create.sh"
 }

.devcontainer/scripts/porter.sh

@@ -13,7 +13,6 @@ ln -s "${PORTER_HOME}/porter" "${PORTER_HOME}/runtimes/porter-runtime"
 "${PORTER_HOME}/porter" mixin install exec --version "${PORTER_VERSION}"
 "${PORTER_HOME}/porter" mixin install terraform --version "${PORTER_TERRAFORM_MIXIN_VERSION}"
 "${PORTER_HOME}/porter" mixin install az --version "${PORTER_AZ_MIXIN_VERSION}"
-"${PORTER_HOME}/porter" mixin install docker --version "${PORTER_DOCKER_MIXIN_VERSION}"
 "${PORTER_HOME}/porter" plugin install azure --version "${PORTER_AZURE_PLUGIN_VERSION}"
 
 chown -R "${USERNAME}" "${PORTER_HOME}"

.devcontainer/scripts/post-create.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
-set -e
+set -o errexit
+set -o pipefail
+set -o nounset
+# Uncomment this line to see each command for debugging (careful: this will show secrets!)
+# set -o xtrace
 
 # docker socket fixup
 sudo bash ./devops/scripts/set_docker_sock_permission.sh

CHANGELOG.md

@@ -4,6 +4,7 @@
 **BREAKING CHANGES & MIGRATIONS**:
 
 ENHANCEMENTS:
+* Remove Porter's Docker mixin as it's not in use ([#2889](https://github.com/microsoft/AzureTRE/pull/2889))
 
 BUG FIXES:
 * Private endpoints for AppInsights are now provisioning successfully and consistently ([#2841](https://github.com/microsoft/AzureTRE/pull/2841))

resource_processor/_version.py

@@ -1 +1 @@
-__version__ = "0.4.11"
+__version__ = "0.4.12"

resource_processor/scripts/porter.sh

@@ -13,5 +13,4 @@ ln -s "${PORTER_HOME}/porter" "${PORTER_HOME}/runtimes/porter-runtime"
 "${PORTER_HOME}/porter" mixin install exec --version "${PORTER_VERSION}"
 "${PORTER_HOME}/porter" mixin install terraform --version "${PORTER_TERRAFORM_MIXIN_VERSION}"
 "${PORTER_HOME}/porter" mixin install az --version "${PORTER_AZ_MIXIN_VERSION}"
-"${PORTER_HOME}/porter" mixin install docker --version "${PORTER_DOCKER_MIXIN_VERSION}"
 "${PORTER_HOME}/porter" plugin install azure --version "${PORTER_AZURE_PLUGIN_VERSION}"

resource_processor/vmss_porter/Dockerfile

@@ -13,7 +13,6 @@ ARG PORTER_MIRROR=https://cdn.porter.sh
 ARG PORTER_VERSION=v0.38.13
 ARG PORTER_TERRAFORM_MIXIN_VERSION=v1.0.0-rc.1
 ARG PORTER_AZ_MIXIN_VERSION=v0.7.3
-ARG PORTER_DOCKER_MIXIN_VERSION=v0.3.0
 ARG PORTER_AZURE_PLUGIN_VERSION=v0.11.2
 ARG PORTER_HOME=/root/.porter/
 COPY scripts/porter.sh /tmp/

templates/workspace_services/innereye/porter.yaml

@@ -1,6 +1,6 @@
 ---
 name: tre-service-innereye
-version: 0.4.0
+version: 0.4.1
 description: "An Azure TRE service for InnerEye Deep Learning"
 registry: azuretre
 dockerfile: Dockerfile.tmpl
@@ -50,7 +50,6 @@ parameters:
 mixins:
   - exec
   - az
-  - docker
   - terraform:
       clientVersion: 1.2.6