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.

Sign up for GitHub

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

Jump to bottom

[Ubuntu] Deprecating docker compose v1 from ubuntu images #10368

Merged
merged 2 commits into from
Jul 30, 2024
Merged

[Ubuntu] Deprecating docker compose v1 from ubuntu images #10368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4bb04
Deprecating docker compose v1 from un=buntu images
kishorekumar-anchala Jul 30, 2024
22eb5f9
Pin sql version for win-19
kishorekumar-anchala Jul 30, 2024
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
21 changes: 0 additions & 21 deletions images/ubuntu/scripts/build/install-docker-compose.sh
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
$tools.AddToolVersion("CMake", $(Get-CMakeVersion))
$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion))
$tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version))
}
$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))
Expand Down
5 changes: 1 addition & 4 deletions images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ function Get-CMakeVersion {
return $cmakeVersion
}

function Get-DockerComposeV1Version {
$composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter ","
return $composeVersion
}


function Get-DockerComposeV2Version {
$composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v"
Expand Down
6 changes: 0 additions & 6 deletions images/ubuntu/scripts/tests/Tools.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,6 @@ Describe "Docker images" {
}
}

Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
It "docker-compose" {
"docker-compose --version"| Should -ReturnZeroExitCode
}
}

Describe "Ansible" {
It "Ansible" {
"ansible --version" | Should -ReturnZeroExitCode
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/templates/ubuntu-20.04.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ build {
provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"]
scripts = ["${path.root}/../scripts/build/install-docker.sh"]
}

provisioner "shell" {
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu/templates/ubuntu-22.04.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ build {
provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"]
scripts = ["${path.root}/../scripts/build/install-docker.sh"]
}

provisioner "shell" {
Expand Down