Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove docker in docker support from RP #3180

Merged
merged 2 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ ENHANCEMENTS:
* Move non-core DNS zones out of the network module to reduce dependencies [#3119](https://github.com/microsoft/AzureTRE/pull/3119)
* Review VMs are being cleaned up when an Airlock request is canceled ([#3130](https://github.com/microsoft/AzureTRE/pull/3130))
* Sample queries to investigate logs of the core TRE applications ([#3151](https://github.com/microsoft/AzureTRE/pull/3151))
* Remove support of docker-in-docker for templates/bundles ([#3180](https://github.com/microsoft/AzureTRE/pull/3180))

BUG FIXES:
* Reauth CLI if TRE endpoint has changed [#3137](https://github.com/microsoft/AzureTRE/pull/3137)
* Added Migration for Airlock requests that were created prior to version 0.5.0 ([#3152](https://github.com/microsoft/AzureTRE/pull/3152))
* Added Migration for Airlock requests that were created prior to version 0.5.0 ([#3152](https://github.com/microsoft/AzureTRE/pull/3152))
* Temporarly use the remote bundle for `check-params` target [#3149](https://github.com/microsoft/AzureTRE/pull/3149)

COMPONENTS:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ bundle-install: # bundle-check-params # TODO: uncomment when resolved https://gi
&& porter install --parameter-set $$(yq ".name" porter.yaml) \
--credential-set arm_auth \
--credential-set aad_auth \
--allow-docker-host-access --debug
--debug

# Validates that the parameters file is synced with the bundle.
# The file is used when installing the bundle from a local machine.
Expand Down Expand Up @@ -244,7 +244,7 @@ bundle-uninstall:
&& porter uninstall --parameter-set $$(yq ".name" porter.yaml) \
--credential-set arm_auth \
--credential-set aad_auth \
--allow-docker-host-access --debug
--debug

bundle-custom-action:
$(call target_title, "Performing:${ACTION} ${DIR} with Porter") \
Expand All @@ -258,7 +258,7 @@ bundle-custom-action:
&& porter invoke --action ${ACTION} --parameter-set $$(yq ".name" porter.yaml) \
--credential-set arm_auth \
--credential-set aad_auth \
--allow-docker-host-access --debug
--debug

bundle-publish:
$(call target_title, "Publishing ${DIR} bundle with Porter") \
Expand Down
2 changes: 1 addition & 1 deletion resource_processor/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.5.1"
__version__ = "0.5.2"
2 changes: 1 addition & 1 deletion resource_processor/resources/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async def build_porter_command(config, logger, msg_body, custom_action=False):
f"{' invoke --action' if custom_action else ''}"
f" {msg_body['action']} \"{installation_id}\""
f" --reference {config['registry_server']}/{msg_body['name']}:v{msg_body['version']}"
f" {porter_parameters} --allow-docker-host-access --force"
f" {porter_parameters} --force"
f" --credential-set arm_auth"
f" --credential-set aad_auth"
]
Expand Down
3 changes: 1 addition & 2 deletions resource_processor/vmss_porter/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,10 @@ async def receive_message(service_bus_client, logger_adapter: logging.LoggerAdap
await receiver.complete_message(msg)

logger_adapter.info(f"Closing session: {receiver.session.session_id}")
await renewer.close()

except OperationTimeoutError:
# Timeout occurred whilst connecting to a session - this is expected and indicates no non-empty sessions are available
logger_adapter.info("No sessions for this process. Will look again...")
logger_adapter.debug("No sessions for this process. Will look again...")

except ServiceBusConnectionError:
# Occasionally there will be a transient / network-level error in connecting to SB.
Expand Down