Skip to content

Commit

Permalink
Ubuntu 2204 update (microsoft#3924)
Browse files Browse the repository at this point in the history 
* Update clean_validation_envs.yml

* update

* update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

* Squashed commit of the following:

commit e66cd82
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue May 7 16:35:57 2024 +0100

    squash commits

commit 933e160
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 4 15:54:39 2024 +0100

    update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

commit 379e93c
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 4 15:52:25 2024 +0100

    update

commit 161880f
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Tue Apr 2 09:38:19 2024 +0100

    Update clean_validation_envs.yml

commit 7908043
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue May 7 16:32:15 2024 +0100

    update changelog

commit 76466e4
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue May 7 16:28:55 2024 +0100

    update changelog

commit 9b3b98e
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:27:52 2024 +0100

    changelog update

commit d199c77
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (microsoft#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit c4d8404
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 81dd79b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 8cecc55
Author: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

commit 49813bf
Author: Jonny Rylands <jonnyry@users.noreply.github.com>
Date:   Wed May 1 18:22:19 2024 +0100

     Remove TLS1.0/1.1 support. Resolves microsoft#3914 (microsoft#3916)

commit a094c19
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue May 7 16:12:53 2024 +0100

    doc update

commit 004a9c0
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue May 7 10:27:09 2024 +0100

    update script

commit 8044fb7
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed May 1 15:19:48 2024 +0100

    updaet

commit 218aa8b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed May 1 15:19:40 2024 +0100

    update

commit 0ac060f
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 30 15:44:47 2024 +0100

    update

commit 0486933
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 30 12:43:46 2024 +0100

    update vm config

commit c9f0749
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 18:11:50 2024 +0100

    Prevent screen timeout

commit 7c2db7f
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 18:09:49 2024 +0100

    updates

commit 8d6cf1d
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 17:16:38 2024 +0100

    update

commit 3ecdec7
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 12:21:28 2024 +0100

    update

commit eb59085
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 12:19:33 2024 +0100

    nexus update

commit 915c6bc
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 10:24:45 2024 +0100

    updste

commit 2345db2
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 10:24:36 2024 +0100

    update proxy url

commit 6b454a3
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 10:03:44 2024 +0100

    update

commit 2ce801b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 09:48:20 2024 +0100

    add in r studio download

commit 3b83b4c
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 29 09:46:11 2024 +0100

    add in snapcraft to nexus

commit dfb6b7b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 16:55:45 2024 +0100

    spelling

commit f896ce3
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 16:08:41 2024 +0100

    update version

commit fd540af
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 16:08:32 2024 +0100

    clean up script

commit 1f8456f
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 14:27:31 2024 +0100

    update

commit 89e65eb
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 14:27:23 2024 +0100

    update

commit ae4cb04
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 14:22:13 2024 +0100

    update

commit c33e033
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 14:10:46 2024 +0100

    update

commit 2e290e1
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 14:03:41 2024 +0100

    update

commit 2c16b60
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 13:57:50 2024 +0100

    update

commit 757d565
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 12:18:28 2024 +0100

    update

commit 977b487
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 11:45:21 2024 +0100

    update

commit 572c27c
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 11:45:12 2024 +0100

    update

commit dc7a6c5
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 11:39:38 2024 +0100

    add in extensions

commit e46c5bb
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 11:34:57 2024 +0100

    add sleeps

commit fa15720
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 11:33:44 2024 +0100

    update

commit 893cf8d
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 10:20:12 2024 +0100

    update

commit 42223aa
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 10:16:27 2024 +0100

    commit

commit 0a7b1e8
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 10:16:19 2024 +0100

    update

commit 6ce77b0
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 26 09:43:49 2024 +0100

    update

commit f1d68da
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 25 17:58:40 2024 +0100

    update

commit 060b6fd
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 25 16:17:09 2024 +0100

    vm update

commit c4e7094
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 25 14:20:05 2024 +0100

    update

commit 760f783
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 23 16:58:05 2024 +0100

    updat

commit 943e07b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 23 15:16:03 2024 +0100

    add in ms download and other apps

commit 7a4d250
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 18 09:57:54 2024 +0100

    update linux

commit 770e4c7
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 16 15:31:25 2024 +0100

    fix linting

commit 4354ca0
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 16 14:06:49 2024 +0100

    format

commit 6980ecb
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 15 16:16:50 2024 +0100

    update

commit a3e5492
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 15 16:16:38 2024 +0100

    update

commit f9d9ffc
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 15 14:44:27 2024 +0100

    update

commit d5a4045
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 15 14:39:17 2024 +0100

    update

commit aa4713c
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 15 12:08:41 2024 +0100

    update image version

commit 2082559
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Mon Apr 15 09:28:08 2024 +0100

    update to gen2

commit cd1a4db
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 16:49:59 2024 +0100

    updaet vm config

commit eff7050
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 16:00:41 2024 +0100

    edit

commit ba9ae50
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 15:10:09 2024 +0100

    update

commit 81801f8
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 14:36:17 2024 +0100

    update version

commit 86909a3
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 12:50:34 2024 +0100

    vm-config

commit c5ce11b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 10:43:48 2024 +0100

    update config

commit b1bb5c9
Merge: 9a28c42 cb59c99
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:32:38 2024 +0100

    Merge branch 'main' into ubuntu-update

commit 9a28c42
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:31:47 2024 +0100

    reset

commit 4a2036b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:29:53 2024 +0100

    update resource proccesor

commit e193943
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:27:52 2024 +0100

    changelog update

commit e8ba5fd
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit f3b4efb
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (microsoft#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit 85cdb98
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit b17bfab
Author: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

commit d8fa5d4
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (microsoft#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit 5e2cdb5
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 9af4f05
Author: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

commit aa4b948
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (microsoft#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit 39aa284
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:12:48 2024 +0100

    resolving comments

commit cb59c99
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 12 09:01:26 2024 +0100

    Update Resource processor Ubuntu Image (microsoft#3902)

    * Update clean_validation_envs.yml

    * update

    * update BRANCH_LAST_ACTIVITY_IN_HOURS_FOR_STOP: 8

    * update core resource processor image

    * remove clean env

    * update version

    * update changelog

commit e06dbcd
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 19:57:14 2024 +0100

    moby-tini || true

commit c08a2b7
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 17:02:01 2024 +0100

    update version

commit 1049390
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 17:01:21 2024 +0100

    remove moby-tini

commit ce4dc82
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 15:53:12 2024 +0100

    update version

commit 7a43e65
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 15:52:58 2024 +0100

    update vm config

commit 7db0e5f
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 14:46:09 2024 +0100

    update ds install_ui: true

commit 8ff7f69
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 14:08:22 2024 +0100

    update script

commit be7212b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 13:40:29 2024 +0100

    update version

commit 3a30d23
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 13:40:18 2024 +0100

    ds install_ui: false

commit a3d9109
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:18:36 2024 +0100

    update readme and changelog

commit 875f2f4
Author: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

commit 9fc272b
Merge: 3a9eecb bc2f233
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:12:57 2024 +0100

    Merge branch 'main' into ubuntu-update

commit 3a9eecb
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 12:12:16 2024 +0100

    testing

commit 3b7522e
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 11:49:49 2024 +0100

    version for guac

commit d75e442
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 11:34:15 2024 +0100

    update to gen2

commit d4a57a3
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 11:28:21 2024 +0100

    update Readme for user resources

commit af50b39
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 11:12:46 2024 +0100

    update apt-get

commit bc414b7
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Thu Apr 11 11:07:43 2024 +0100

    update config

commit bc2f233
Author: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>
Date:   Thu Apr 11 09:50:09 2024 +0100

    Update "Azure AD" references to "Microsoft Entra ID" (microsoft#3873)

    * rename Azure AD to Microsoft Entra Workforce ID

    * update Azure Active Directory to Microsoft Entra Workforce ID

    * replace

    * update version

    * change stale version

    * update from stale

    * update version

    * update readme

    * Microsoft Entra Workforce ID -> Microsoft Entra ID

    * AAD -> Microsoft Entra ID

    * Delete .devcontainer/devcontainer.json

    * Revert "Delete .devcontainer/devcontainer.json"

    This reverts commit 5dd6d5c.

    * revert code changes

    * remove double names

    * update version

    * go back version

    * api update version

    * revert for linting

    * revert test linting

    * fix linting

    * roll back linting

    * increase line length

    * fix linting

    * fix formatting

    * fix lintin 3

    * update urls

    * update aad urls

    ---------

    Co-authored-by: Tim Allen <tim.allen@cloudkubed.com>

commit a09af34
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 16:44:01 2024 +0100

    update apt-source-list

commit 271c7e0
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 15:57:32 2024 +0100

    update pypi source

commit 1ea1159
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 15:53:40 2024 +0100

    update

commit d1beb03
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 15:51:51 2024 +0100

    updaye

commit 9c2211b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 15:31:17 2024 +0100

    update core

commit c7ebc5b
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 15:29:00 2024 +0100

    update linux vms

commit 18df98c
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 15:27:42 2024 +0100

    update version

commit 19316a1
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Wed Apr 10 14:03:08 2024 +0100

    update install UI

commit 47c8182
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 9 19:39:14 2024 +0300

    Bump the npm_and_yarn group in /ui/app with 3 updates (microsoft#3891)

    * Bump the npm_and_yarn group in /ui/app with 3 updates

    Bumps the npm_and_yarn group in /ui/app with 3 updates: [express](https://github.com/expressjs/express), [follow-redirects](https://github.com/follow-redirects/follow-redirects) and [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware).

    Updates `express` from 4.18.3 to 4.19.2
    - [Release notes](https://github.com/expressjs/express/releases)
    - [Changelog](https://github.com/expressjs/express/blob/master/History.md)
    - [Commits](expressjs/express@4.18.3...4.19.2)

    Updates `follow-redirects` from 1.15.5 to 1.15.6
    - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
    - [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6)

    Updates `webpack-dev-middleware` from 5.3.3 to 5.3.4
    - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
    - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
    - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

    ---
    updated-dependencies:
    - dependency-name: express
      dependency-type: indirect
      dependency-group: npm_and_yarn-security-group
    - dependency-name: follow-redirects
      dependency-type: indirect
      dependency-group: npm_and_yarn-security-group
    - dependency-name: webpack-dev-middleware
      dependency-type: indirect
      dependency-group: npm_and_yarn-security-group
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    * update ui version

    ---------

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Tim Allen <tim.allen@cloudkubed.com>

commit 072cfdc
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 9 17:26:28 2024 +0100

    add in microsoft-apt/ubuntu/20.04 to source-list

commit 30ecfa2
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 9 14:55:25 2024 +0100

    add in image to enum

commit 33d14be
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 9 14:33:52 2024 +0100

    update image options

commit 7aa64ba
Author: tim-allen-ck <tim.allen@cloudkubed.com>
Date:   Tue Apr 9 12:09:38 2024 +0100

    update

commit ea63ebf
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Tue Apr 9 06:37:40 2024 +0100

    Feature/GitHub actions update (microsoft#3897)

    * Update clean_validation_envs.yml

    * azure login (#19)

    Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

    * GitHub actions update (#22)

    * azure login

    * reset cron

    * update action versions

    ---------

    Co-authored-by: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>

    * change conclusion action

    * add in teams

    ---------

    Co-authored-by: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>

commit de14165
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Fri Apr 5 12:42:03 2024 +0100

    Documentation Pipeline Fix (microsoft#3898)

    add in permissions to pipeline

commit c92494e
Merge: 2716749 086be33
Author: Tim Allen <tim.allen@cloudkubed.com>
Date:   Thu Apr 4 16:54:43 2024 +0100

    Merge branch 'main' into ubuntu-update

commit 2716749
Author: wojciechcloudkubed <159798789+wojciechcloudkubed@users.noreply.github.com>
Date:   Tue Apr 2 09:23:37 2024 +0100

    Ubuntu update (#1)

    * personal

    * update ubuntu image

    * revert changes

    * update ubuntu version

    * update version

    * update offer

    * update sku

    * change offer

    ---------

    Co-authored-by: Wojciech <57405495+thewbuk@users.noreply.github.com>

* update env yaml

* update bash

* update linting

* update docs

* comment fixes

* update

* update nexus sku

* Update docs/tre-templates/user-resources/guacamole-linux-vm.md

Co-authored-by: Marcus Robinson <marrobi@microsoft.com>

* update docs

* docs

---------

Co-authored-by: Marcus Robinson <marrobi@microsoft.com>
  • Loading branch information
@tim-allen-ck @marrobi
tim-allen-ck and marrobi committed May 9, 2024
1 parent c8e5ed3 commit 606a5d9
Show file tree
Hide file tree
Showing 21 changed files with 330 additions and 56 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ FEATURES:
ENHANCEMENTS:

BUG FIXES:
* Update Guacomole Linux VM Images to Ubuntu 22.04 LTS. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523))
* Update Nexus Shared Service with new proxies. Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523))
* Update to Resource Processor Image, now using Ubuntu 22.04 (jammy). Part of ([#3523](https://github.com/microsoft/AzureTRE/issues/3523))
* Remove TLS1.0/1.1 support from Application Gateway
* Remove TLS1.0/1.1 support from Application Gateway ([#3914](https://github.com/microsoft/AzureTRE/issues/3914))
* GitHub Actions version updates. ([#3847](https://github.com/microsoft/AzureTRE/issues/3847))

COMPONENTS:

Expand Down
19 changes: 19 additions & 0 deletions docs/tre-templates/shared-services/nexus.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ Nexus Shared Service requires access to resources outside of the Azure TRE VNET.
| Ubuntu Security Packages | apt | [http://security.ubuntu.com/ubuntu/] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/ubuntu-security/` | Provide access to Ubuntu Security apt packages on Ubuntu systems. |
| Almalinux | yum | [https://repo.almalinux.org] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/almalinux` | Install Almalinux packages |
| R-Proxy | r | [https://cran.r-project.org/] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/r-proxy` | Provide access to CRAN packages for R |
| R-Studio Download | raw | [https://download1.rstudio.org] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/r-studio-download` | Provide access to download R Studio |
| Fedora Project | yum | [https://download-ib01.fedoraproject.org] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/fedoraproject` | Install Fedora Project Linux packages |
| Microsoft Apt | apt | [https://packages.microsoft.com] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/microsoft-apt` | Provide access to Microsoft Apt packages |
| Microsoft Keys | raw | [https://packages.microsoft.com/keys/] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/microsoft-keys` | Provide access to Microsoft keys |
| Microsoft Yum | yum | [https://packages.microsoft.com/yumrepos] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/microsoft-yum` | Provide access to Microsoft Yum packages |
| Microsoft Download | raw | [https://download.microsoft.com/download] | `https://nexus-{TRE_ID}.{LOCATION}.cloudapp.azure.com/repository/microsoft-download` | Provide access to Microsoft Downloads |
### Migrate from an existing V1 Nexus service (hosted on App Service)
Expand All @@ -111,3 +113,20 @@ If you still have an existing Nexus installation based on App Service (from the
The Nexus service checks Key Vault regularly for the latest certificate matching the name you passed on deploy (`nexus-ssl` by default).
When approaching expiry, you can either provide an updated certificate into the TRE core KeyVault (with the name you specified when installing Nexus) if you brought your own, or if you used the certs shared service to generate one, just call the `renew` custom action on that service. This will generate a new certificate and persist it to the Key Vault, replacing the expired one.
## Updating to v3.0.0
The newest version of Nexus is a significant update for the service.
As a result, a new installation of Nexus will be necessary.
We are currently in the process of developing an upgrade path for upcoming releases.
## Using Docker Hub
When using Docker with a VM, the image URL should be constructed as follows: {NEXUS_URL}:{port}/docker-image
```bash
sudo docker pull {NEXUS_URL}:8083/hello-world
```
the default port out of the box is 8083
Nexus will also need "Anonymous Access" set to "Enable". This can be done by logging into the Nexus Portal with the Admin user and following the prompts.
62 changes: 62 additions & 0 deletions docs/tre-templates/user-resources/custom.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Guacamole User Resources

- linuxvm - a Linux-based virtual machine
- windowsvm - A Windows-based virtual machine

## Customising the user resources

The `guacamole-azure-linuxvm` and `guacamole-azure-windowsvm` folders follow a consistent layout.
To update one of these templates (or to create a new template based on these folders) to use different image details or VM sizes, there are a few files that need to be updated:

| File | Description |
| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `porter.yaml` | This file describes the template and the name should be updated when creating a template based on the folder.<br> This file also contains a `custom` data section that describes the VM properties.<br> Additionally, the version needs to be updated to deploy an updated version |
| `template_schema.json` | This file controls the validation applied to the template, for example specifying the valid options for fields such as size and image |

### Configuration

In `porter.yaml`, the `custom` section contains a couple of sub-sections (shown below)

```yaml
custom:
vm_sizes:
"2 CPU | 8GB RAM": Standard_D2s_v5
"4 CPU | 16GB RAM": Standard_D4s_v5
"8 CPU | 32GB RAM": Standard_D8s_v5
"16 CPU | 64GB RAM": Standard_D16s_v5
image_options:
"Ubuntu 22.04 LTS":
source_image_reference:
publisher: canonical
offer: 0001-com-ubuntu-server-jammy
sku: 22_04-lts-gen2
version: latest
apt_sku: 22.04
install_ui: true
conda_config: false
# "Custom Image From Gallery":
# source_image_name: your-image
# install_ui: true
# conda_config: true
```

The `vm_sizes` section is a map of a custom SKU description to the SKU identifier.

The `image_options` section defined the possible image choices for the template (note that the name of the image used here needs to be included in the corresponding enum in `template_schema.json`).

Within the image definition in `image_options` there are a few properties that can be specified:

| Name | Description |
| ------------------------ | -------------------------------------------------------------------------------------------------------- |
| `source_image_name` | Specify VM image to use by name (see notes below for identifying the image gallery containing the image) |
| `source_image_reference` | Specify VM image to use by `publisher`, `offer`, `sku` & `version` (e.g. for Azure Marketplace images) |
| `install_ui` | (Linux only) Set `true` to install desktop environment |
| `conda_config` | Set true to configure conda |

When specifying images using `source_image_name`, the image must be stored in an [image gallery](https://learn.microsoft.com/en-us/azure/virtual-machines/azure-compute-gallery).
To enable re-using built user resource templates across environments where the image may vary, the image gallery is configured via the `RP_BUNDLE_VALUES` environment variable when deploying the TRE.
The `RP_BUNDLE_VALUES` variable is a JSON object, and the `image_gallery_id` property within it identifies the image gallery that contains the images specified by `source_image_name`:

```bash
RP_BUNDLE_VALUES='{"image_gallery_id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/<your-rg>/providers/Microsoft.Compute/galleries/<your-gallery-name>"}
```
10 changes: 10 additions & 0 deletions docs/tre-templates/user-resources/guacamole-linux-vm.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,13 @@ It blocks all inbound and outbound traffic to the internet and allows only RDP c

- [A base workspace bundle installed](../workspaces/base.md)
- [A guacamole workspace service bundle installed](../workspace-services/guacamole.md)
- [A Nexus shared service has been deployed](../shared-services/nexus.md)

## Notes

- Nexus is a prerequisite of installing the Linux VMs given the additional commands in the bootstrap scripts.
- In production we recommend using VM images to avoid transient issues downloading and installing packages. The included user resource templates for VMs with bootstrap scripts should only be used for trial/demonstration purposes. More info can be found [here](./custom.md).
- Snap (app store for linux via [snapcraft.io](https://snapcraft.io)) hasn't been configured to work via the nexus proxy

## Using Custom Images
For custom image usage, visit this [page](./custom.md).
2 changes: 1 addition & 1 deletion e2e_tests/test_performance.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ async def test_bulk_updates_to_ensure_each_resource_updated_in_series(verify) ->
"properties": {
"display_name": "Perf test VM",
"description": "",
"os_image": "Ubuntu 18.04"
"os_image": "Ubuntu 22.04 LTS"
}
}

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/sonatype-nexus-vm/porter.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-shared-service-sonatype-nexus
version: 2.8.13
version: 3.0.0
description: "A Sonatype Nexus shared service"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down
5 changes: 2 additions & 3 deletions templates/shared_services/sonatype-nexus-vm/scripts/nexus_realms_config.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[
"NexusAuthenticatingRealm",
"NexusAuthorizingRealm",
"DockerToken"
"DockerToken",
"NexusAuthenticatingRealm"
]
32 changes: 32 additions & 0 deletions ...shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/microsoft_download_conf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "microsoft-download",
"online": true,
"storage": {
"blobStoreName": "default",
"strictContentTypeValidation": true,
"write_policy": "ALLOW"
},
"proxy": {
"remoteUrl": "https://download.microsoft.com/download",
"contentMaxAge": 1440,
"metadataMaxAge": 1440
},
"negativeCache": {
"enabled": true,
"timeToLive": 1440
},
"httpClient": {
"blocked": false,
"autoBlock": false,
"connection": {
"retries": 0,
"userAgentSuffix": "string",
"timeout": 60,
"enableCircularRedirects": false,
"enableCookies": false,
"useTrustStore": false
}
},
"baseType": "raw",
"repoType": "proxy"
}
32 changes: 32 additions & 0 deletions .../shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/r_studio_download_conf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "r-studio-download",
"online": true,
"storage": {
"blobStoreName": "default",
"strictContentTypeValidation": true,
"write_policy": "ALLOW"
},
"proxy": {
"remoteUrl": "https://download1.rstudio.org",
"contentMaxAge": 1440,
"metadataMaxAge": 1440
},
"negativeCache": {
"enabled": true,
"timeToLive": 1440
},
"httpClient": {
"blocked": false,
"autoBlock": false,
"connection": {
"retries": 0,
"userAgentSuffix": "string",
"timeout": 60,
"enableCircularRedirects": false,
"enableCookies": false,
"useTrustStore": false
}
},
"baseType": "raw",
"repoType": "proxy"
}
32 changes: 32 additions & 0 deletions templates/shared_services/sonatype-nexus-vm/scripts/nexus_repos_config/snapcraft_conf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "snapcraft",
"online": true,
"storage": {
"blobStoreName": "default",
"strictContentTypeValidation": true,
"write_policy": "ALLOW"
},
"proxy": {
"remoteUrl": "https://snapcraftcontent.com",
"contentMaxAge": 1440,
"metadataMaxAge": 1440
},
"negativeCache": {
"enabled": true,
"timeToLive": 1440
},
"httpClient": {
"blocked": false,
"autoBlock": false,
"connection": {
"retries": 0,
"userAgentSuffix": "string",
"timeout": 60,
"enableCircularRedirects": false,
"enableCookies": false,
"useTrustStore": false
}
},
"baseType": "raw",
"repoType": "proxy"
}
2 changes: 1 addition & 1 deletion templates/shared_services/sonatype-nexus-vm/terraform/locals.tf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
core_vnet = "vnet-${var.tre_id}"
core_resource_group_name = "rg-${var.tre_id}"
nexus_allowed_fqdns = "pypi.org,*.pypi.org,files.pythonhosted.org,security.ubuntu.com,archive.ubuntu.com,keyserver.ubuntu.com,repo.anaconda.com,*.docker.com,*.docker.io,conda.anaconda.org,azure.archive.ubuntu.com,packages.microsoft.com,repo.almalinux.org,download-ib01.fedoraproject.org,cran.r-project.org,cloud.r-project.org"
nexus_allowed_fqdns = "pypi.org,*.pypi.org,files.pythonhosted.org,security.ubuntu.com,archive.ubuntu.com,keyserver.ubuntu.com,repo.anaconda.com,*.docker.com,*.docker.io,conda.anaconda.org,azure.archive.ubuntu.com,packages.microsoft.com,repo.almalinux.org,download-ib01.fedoraproject.org,cran.r-project.org,cloud.r-project.org,download1.rstudio.org,*.snapcraftcontent.com,download.microsoft.com"
nexus_allowed_fqdns_list = distinct(compact(split(",", replace(local.nexus_allowed_fqdns, " ", ""))))
workspace_vm_allowed_fqdns = "r3.o.lencr.org,x1.c.lencr.org"
workspace_vm_allowed_fqdns_list = distinct(compact(split(",", replace(local.workspace_vm_allowed_fqdns, " ", ""))))
Expand Down
1 change: 1 addition & 0 deletions templates/shared_services/sonatype-nexus-vm/terraform/vm.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ resource "azurerm_user_assigned_identity" "nexus_msi" {
location = data.azurerm_resource_group.rg.location
resource_group_name = local.core_resource_group_name
tags = local.tre_shared_service_tags

lifecycle { ignore_changes = [tags] }
}

Expand Down
20 changes: 5 additions & 15 deletions templates/workspace_services/guacamole/user_resources/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

This folder contains user resources that can be deployed with the Guacamole workspace service:

- linuxvm - a Linux-based virtual machine (expects an Ubuntu 18.04-based VM)
- linuxvm - a Linux-based virtual machine
- windowsvm - A Windows-based virtual machine


## Customising the user resources

The `guacamole-azure-linuxvm` and `guacamole-azure-windowsvm` folders follow a consistent layout.
Expand All @@ -29,22 +28,15 @@ custom:
"8 CPU | 32GB RAM": Standard_D8s_v5
"16 CPU | 64GB RAM": Standard_D16s_v5
image_options:
"Ubuntu 18.04":
"Ubuntu 22.04 LTS":
source_image_reference:
publisher: canonical
offer: ubuntuserver
sku: 18_04-lts-gen2
offer: 0001-com-ubuntu-server-jammy
sku: 22_04-lts-gen2
version: latest
apt_sku: 22.04
install_ui: true
conda_config: false
"Ubuntu 18.04 Data Science VM":
source_image_reference:
publisher: microsoft-dsvm
offer: ubuntu-1804
sku: 1804-gen2
version: latest
install_ui: false
conda_config: true
# "Custom Image From Gallery":
# source_image_name: your-image
# install_ui: true
Expand All @@ -68,8 +60,6 @@ When specifying images using `source_image_name`, the image must be stored in an
To enable re-using built user resource templates across environments where the image may vary, the image gallery is configured via the `RP_BUNDLE_VALUES` environment variable when deploying the TRE.
The `RP_BUNDLE_VALUES` variable is a JSON object, and the `image_gallery_id` property within it identifies the image gallery that contains the images specified by `source_image_name`:


```bash
RP_BUNDLE_VALUES='{"image_gallery_id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/<your-rg>/providers/Microsoft.Compute/galleries/<your-gallery-name>"}
```
20 changes: 6 additions & 14 deletions templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-service-guacamole-linuxvm
version: 0.6.9
version: 1.0.0
description: "An Azure TRE User Resource Template for Guacamole (Linux)"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand All @@ -14,29 +14,21 @@ custom:
"8 CPU | 32GB RAM": Standard_D8s_v5
"16 CPU | 64GB RAM": Standard_D16s_v5
image_options:
"Ubuntu 18.04":
"Ubuntu 22.04 LTS":
source_image_reference:
publisher: canonical
offer: ubuntuserver
sku: 18_04-lts-gen2
offer: 0001-com-ubuntu-server-jammy
sku: 22_04-lts-gen2
version: latest
apt_sku: 22.04
install_ui: true
conda_config: false
"Ubuntu 18.04 Data Science VM":
source_image_reference:
publisher: microsoft-dsvm
offer: ubuntu-1804
sku: 1804-gen2
version: latest
install_ui: false
conda_config: true
# For information on using custom images, see README.me in the guacamole/user-resources folder
# "Custom Image From Gallery":
# source_image_name: your-image
# install_ui: true
# conda_config: true


credentials:
- name: azure_tenant_id
env: ARM_TENANT_ID
Expand Down Expand Up @@ -91,7 +83,7 @@ parameters:
default: "public"
- name: os_image
type: string
default: "Ubuntu 18.04 Data Science VM"
default: "Ubuntu 22.04 LTS"
- name: vm_size
type: string
default: "2 CPU | 8GB RAM"
Expand Down
3 changes: 1 addition & 2 deletions .../workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/template_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"title": "Linux image",
"description": "Select Linux image to use for VM",
"enum": [
"Ubuntu 18.04",
"Ubuntu 18.04 Data Science VM"
"Ubuntu 22.04 LTS"
]
},
"vm_size": {
Expand Down
4 changes: 3 additions & 1 deletion ...ervices/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ apt:
deb [trusted=yes] $PRIMARY $RELEASE main restricted universe multiverse
deb [trusted=yes] $PRIMARY $RELEASE-updates main restricted universe multiverse
deb [trusted=yes] $SECURITY $RELEASE main restricted universe multiverse
deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/18.04/prod $RELEASE main
deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${apt_sku}/prod $RELEASE main
deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/edge stable main
deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/vscode stable main
deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/azure-cli $RELEASE main
deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable
4 changes: 4 additions & 0 deletions ...space_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ set -o nounset
# Uncomment this line to see each command for debugging (careful: this will show secrets!)
# set -o xtrace

#remove key if they already exist
sudo rm -f /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg || true
sudo rm -f /etc/apt/trusted.gpg.d/microsoft.gpg || true

# Get Docker Public key from Nexus
curl -fsSL "${NEXUS_PROXY_URL}"/repository/docker-public-key/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg

Expand Down
Loading

0 comments on commit 606a5d9

Please sign in to comment.