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

Mention ubuntu in docker build variants #99

Merged
merged 1 commit into from
Mar 6, 2024
Merged

Mention ubuntu in docker build variants #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Build Pype docker image
# Build AYON docker image
FROM ubuntu:focal AS builder
ARG PYTHON_VERSION=3.9.12
ARG BUILD_DATE
Expand Down
8 changes: 6 additions & 2 deletions tools/manage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@ function New-DockerBuild {
$startTime = [int][double]::Parse((Get-Date -UFormat %s))
Write-Color -Text ">>> ", "Building AYON using Docker ..." -Color Green, Gray, White
$variant = $args[0]
$dockerfile = "$($repo_root)\Dockerfile.$variant"
if (($variant -eq $null) -or ($variant -eq "ubuntu")) {
$dockerfile = "$($repo_root)\Dockerfile"
} else {
$dockerfile = "$($repo_root)\Dockerfile.$variant"
}
if (-not (Test-Path -PathType Leaf -Path $dockerfile)) {
Write-Color -Text "!!! ", "Dockerfile for specifed platform ", "[", $variant, "]", "doesn't exist." -Color Red, Yellow, Cyan, White, Cyan, Yellow
Restore-Cwd
Expand Down Expand Up @@ -251,7 +255,7 @@ function Default-Func {
Write-Color -text " build-make-installer ", "Build desktop application and make installer" -Color White, Cyan
Write-Color -text " upload ", "Upload installer to server" -Color White, Cyan
Write-Color -text " run ", "Run desktop application from code" -Color White, Cyan
Write-Color -text " docker-build ","[variant] ", "Build AYON using Docker. Variant can be '", "centos7", "', '", "debian", "' or '", "rocky9", "'" -Color White, Yellow, Cyan, Yellow, Cyan, Yellow, Cyan, Yellow, Cyan
Write-Color -text " docker-build ","[variant] ", "Build AYON using Docker. Variant can be '", "centos7", "', '", "ubuntu","', '", "debian", "' or '", "rocky9", "'" -Color White, Yellow, Cyan, Yellow, Cyan, Yellow, Cyan, Yellow, Cyan, Yellow, Cyan
Write-Host ""
}

Expand Down