@@ -20,18 +20,19 @@ ENV DEBIAN_FRONTEND=noninteractive \
2020 WORKER_BIN_DIR=/usr/local/worker/bin \
2121 WORKER_ETC_DIR=/usr/local/worker/etc \
2222 # Add worker bin to PATH
23- PATH=/usr/local/worker/bin:${PATH} \
24- # Cloud SDK configurations
25- CLOUDSDK_CONFIG=/usr/local/configs/gcloud \
26- AWS_CONFIG_FILE=/usr/local/configs/aws \
27- AZURE_CONFIG_DIR=/usr/local/configs/azure
23+ PATH=/usr/local/worker/bin:${PATH}
2824
2925# Set the shell with pipefail option
3026SHELL ["/bin/bash" , "-o" , "pipefail" , "-c" ]
3127
3228# Set user to root for installation
3329USER root
3430
31+ # Set config paths
32+ ENV AWS_CONFIG_FILE=${HOME}/.config/aws
33+ ENV AZURE_CONFIG_DIR=${HOME}/.config/azure
34+ ENV CLOUDSDK_CONFIG=${HOME}/.config/gcloud
35+
3536# Install necessary packages
3637# hadolint ignore=DL3015
3738RUN apt-get update && \
@@ -49,8 +50,8 @@ RUN apt-get update && \
4950 unzip=6.0-28ubuntu6 \
5051 nano=8.3-1 \
5152 vim=2:9.1.0967-1ubuntu4 \
52- python3.13=3.13.3-1ubuntu0.2 \
53- python3.13-venv=3.13.3-1ubuntu0.2 \
53+ python3.13=3.13.3-1ubuntu0.3 \
54+ python3.13-venv=3.13.3-1ubuntu0.3 \
5455 python3-pip=25.0+dfsg-1ubuntu0.1 \
5556 supervisor=4.2.5-3 && \
5657 # Install Azure CLI in venv with optimizations for scanning
@@ -75,12 +76,11 @@ RUN echo $TZ > /etc/timezone && \
7576# Install yq (architecture-aware)
7677RUN ARCH=$(uname -m) && \
7778 if [ "$ARCH" = "x86_64" ]; then ARCH="amd64" ; elif [ "$ARCH" = "aarch64" ]; then ARCH="arm64" ; fi && \
78- curl -sL https://github.com/mikefarah/yq/releases/download/v4.47.1 /yq_linux_${ARCH}.tar.gz | tar xz && \
79+ curl -sL https://github.com/mikefarah/yq/releases/download/v4.47.2 /yq_linux_${ARCH}.tar.gz | tar xz && \
7980 mv yq_linux_${ARCH} /usr/bin/yq && \
8081 rm -rf /tmp/*
8182
8283# Install Google Cloud SDK (architecture-aware)
83- ENV CLOUDSDK_CONFIG=/usr/local/configs/gcloud
8484RUN ARCH=$(uname -m) && \
8585 if [ "$ARCH" = "x86_64" ]; then \
8686 curl -sSL "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-532.0.0-linux-x86_64.tar.gz" -o google-cloud-sdk.tar.gz; \
@@ -95,7 +95,6 @@ RUN ARCH=$(uname -m) && \
9595ENV PATH=$PATH:/google-cloud-sdk/bin
9696
9797# Install AWS CLI (architecture-aware)
98- ENV AWS_CONFIG_FILE=/usr/local/configs/aws
9998RUN ARCH=$(uname -m) && \
10099 curl "https://awscli.amazonaws.com/awscli-exe-linux-${ARCH}.zip" -o "awscliv2.zip" && \
101100 unzip awscliv2.zip && \
@@ -136,9 +135,10 @@ RUN mkdir -p \
136135 # User and config directories
137136 ${HOME}/.config/worker \
138137 # Cloud SDK config directories
139- ${CLOUDSDK_CONFIG} \
140- ${AWS_CONFIG_FILE%/*} \
141- ${AZURE_CONFIG_DIR} && \
138+ ${HOME}/.config/gcloud \
139+ ${HOME}/.config/gcloud/credentials \
140+ ${HOME}/.config/aws \
141+ ${HOME}/.config/azure && \
142142 # Create and set permissions for environment files
143143 touch ${WORKER_CONFIG_DIR}/environment && \
144144 chown ${USER}:${USER} ${WORKER_CONFIG_DIR}/environment && \
@@ -168,13 +168,12 @@ RUN \
168168 ${WORKER_LIB_DIR} \
169169 ${WORKER_BIN_DIR} \
170170 ${HOME} \
171- ${CLOUDSDK_CONFIG} \
172- ${AWS_CONFIG_FILE%/*} \
173- ${AZURE_CONFIG_DIR} \
174171 /opt/az && \
175172 # Set Azure CLI permissions
176173 chmod -R 755 /opt/az/bin && \
177- chmod -R 700 ${AZURE_CONFIG_DIR} && \
174+ # Set cloud config directory permissions
175+ chmod -R 700 ${HOME}/.config/gcloud/credentials && \
176+ chmod -R 700 ${HOME}/.config/azure && \
178177 # Set directory permissions
179178 find ${WORKER_BASE_DIR} ${WORKER_CONFIG_DIR} ${WORKER_LIB_DIR} ${WORKER_BIN_DIR} -type d -exec chmod 755 {} + && \
180179 # Set base file permissions
0 commit comments