úprava publish

This commit is contained in:
2026-02-21 20:01:30 +00:00
parent b48ee09f80
commit f6b3091300
2 changed files with 15 additions and 9 deletions

View File

@@ -1,10 +1,15 @@
# Používame oficiálny Python image, ale env bude podobné ako v base:ubuntu
ARG PYTHON_VERSION=3.13
FROM python:${PYTHON_VERSION}-slim
ENV PYTHONUNBUFFERED=1 \
PIP_NO_CACHE_DIR=1 \
PIP_DISABLE_PIP_VERSION_CHECK=1
# Pouzivame oficialny Python image a build argy mapujeme na .devcontainer/.env.
ARG PYTHON_BASE=3.13
ARG PIP_INDEX_URL=https://dv.masara.eu/repository/pypi-group/simple
FROM python:${PYTHON_BASE}-slim
# Re-declare build args for this stage.
ARG PIP_INDEX_URL
ENV PYTHONUNBUFFERED=1 \
PIP_NO_CACHE_DIR=1 \
PIP_DISABLE_PIP_VERSION_CHECK=1 \
PIP_INDEX_URL=${PIP_INDEX_URL}
# Základ + Docker repo + docker-ce-cli + compose plugin + git
RUN set -eux; \

View File

@@ -21,7 +21,7 @@ Get-Content $EnvFile | ForEach-Object {
}
}
$required = @("PYTHON_BASE", "DEVCONTAINER_IMAGE_PUSH_REPO", "DEVCONTAINER_IMAGE_REV")
$required = @("PYTHON_BASE", "PIP_INDEX_URL", "DEVCONTAINER_IMAGE_PUSH_REPO", "DEVCONTAINER_IMAGE_REV")
foreach ($key in $required) {
if (-not $vars.ContainsKey($key) -or [string]::IsNullOrWhiteSpace($vars[$key])) {
throw "Missing required key '$key' in $EnvFile"
@@ -29,6 +29,7 @@ foreach ($key in $required) {
}
$pythonBase = $vars["PYTHON_BASE"]
$pipIndexUrl = $vars["PIP_INDEX_URL"]
$pushRepo = $vars["DEVCONTAINER_IMAGE_PUSH_REPO"]
$rev = $vars["DEVCONTAINER_IMAGE_REV"]
@@ -63,7 +64,7 @@ function Invoke-DockerPushWithLoginFallback {
}
Write-Host "Building $versionTag"
docker build -f $Dockerfile --build-arg "PYTHON_VERSION=$pythonBase" -t $versionTag -t $channelTag .
docker build -f $Dockerfile --build-arg "PYTHON_BASE=$pythonBase" --build-arg "PIP_INDEX_URL=$pipIndexUrl" -t $versionTag -t $channelTag .
if ($LASTEXITCODE -ne 0) {
throw "docker build failed"
}