Skip to content

Commit

Permalink
Merge pull request #99 from ynput/enhancement/explicit-docker-name
Browse files Browse the repository at this point in the history
Mention ubuntu in docker build variants
  • Loading branch information
iLLiCiTiT authored Mar 6, 2024
2 parents 8c65b4a + bcf1a92 commit 86ba210
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
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
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

0 comments on commit 86ba210

Please sign in to comment.