Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@clemlesne
clemlesne committed Nov 25, 2024
2 parents e9cab40 + 40fa04d commit 9a305c5
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/pipeline.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,10 @@ jobs:
ROOTLESSKIT_VERSION=${{ env.ROOTLESSKIT_VERSION }}
TINI_VERSION=${{ env.TINI_VERSION }}
YQ_VERSION=${{ env.YQ_VERSION }}
cache-from: type=gha,scope=buildkit-${{ matrix.os }}-${{ github.ref_name }}
cache-from: |
type=gha,scope=buildkit-${{ matrix.os }}-${{ github.ref_name }}
type=gha,scope=buildkit-${{ matrix.os }}-develop
type=gha,scope=buildkit-${{ matrix.os }}-main
cache-to: type=gha,scope=buildkit-${{ matrix.os }}-${{ github.ref_name }}
context: src/docker
file: src/docker/Dockerfile-${{ matrix.os }}
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-bookworm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -167,6 +170,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -165,6 +168,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-focal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -164,6 +167,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-jammy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -164,6 +167,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-noble
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -165,6 +168,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-ubi8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -161,6 +164,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-ubi9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,11 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel \
--upgrade \
pip setuptools wheel \
&& find / -depth -type d -name __pycache__ -exec rm -rf {} \; 2> /dev/null

# Install Azure CLI, then verify installation
Expand All @@ -160,6 +163,8 @@ RUN --mount=target=/${USER}/.cache/pip,type=cache,id=pip-${PYTHON_VERSION_MAJOR_
python3 -m pip \
--disable-pip-version-check \
--quiet \
--retries 8 \
--timeout 120 \
install \
azure-cli==${AZURE_CLI_VERSION} \
&& az version \
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-win-ltsc2019
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ RUN python --version \
--disable-pip-version-check \
--no-cache-dir \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel
--upgrade \
pip setuptools wheel

# Install Azure CLI, then verify installation
# TODO: Clean up "__pycache__" folders on disk
Expand All @@ -64,6 +67,8 @@ RUN python -m pip \
--disable-pip-version-check \
--no-cache-dir \
--quiet \
--retries 8 \
--timeout 120 \
install \
"azure-cli==${Env:AZURE_CLI_VERSION}" \
&& az version
Expand Down
7 changes: 6 additions & 1 deletion src/docker/Dockerfile-win-ltsc2022
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ RUN python --version \
--disable-pip-version-check \
--no-cache-dir \
--quiet \
--retries 8 \
--timeout 120 \
install \
setuptools wheel
--upgrade \
pip setuptools wheel

# Install Azure CLI, then verify installation
# TODO: Clean up "__pycache__" folders on disk
Expand All @@ -64,6 +67,8 @@ RUN python -m pip \
--disable-pip-version-check \
--no-cache-dir \
--quiet \
--retries 8 \
--timeout 120 \
install \
"azure-cli==${Env:AZURE_CLI_VERSION}" \
&& az version
Expand Down

0 comments on commit 9a305c5

Please sign in to comment.