Skip to content

Commit 4db39a8

Browse files
authored
Merge pull request #586 from Roming22/dev_setup
Fix devenv
2 parents 062d00d + c2bff11 commit 4db39a8

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

developer/hack/run_image.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ run_image() {
167167

168168
if [ -n "$WORKSPACE_DIR" ]; then
169169
CONTAINER_OPTIONS+=( "--volume" "$WORKSPACE_DIR:/workspace:Z" )
170+
171+
# These settings are required to run dev_setup.sh successfully
172+
CONTAINER_OPTIONS+=( "--privileged" "--volume" "/var/run/podman:/var/run/podman" ) # Enable podman in podman
173+
CONTAINER_OPTIONS+=( "--volume" "$HOME/.kube:/root/.kube:Z" "--volume" "$HOME/.ssh:/root/.ssh:Z" ) # Access user's config
170174
fi
171175

172176
echo "[Run $image_name]" >"$STDOUT"

developer/images/devenv/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ RUN set -x \
1111
# python3-devl is needed when installing checkov's dependencies
1212
python3-devel-3.11.2 \
1313
python3-pip-22.2.2 \
14+
rsync-3.2.7 \
1415
unzip-6.0 \
1516
which-2.21 \
1617
xz-5.4.1 \
17-
&& dnf clean all
18+
&& dnf clean all \
19+
&& sed -i -e "s:podman:root:" /etc/subuid /etc/subgid \
20+
&& podman system migrate
1821
COPY shared /tmp/image-build/shared
1922
RUN /tmp/image-build/shared/hack/install.sh --debug --bin argocd,bitwarden,checkov,hadolint,jq,kind,kubectl,oc,shellcheck,tkn,yamllint,yq \
2023
&& rm -rf /tmp/image-build

0 commit comments

Comments
 (0)