Skip to content

Commit 552414f

Browse files
fix dockerfile
Signed-off-by: stoneshi-yunify <[email protected]>
1 parent 7149d26 commit 552414f

File tree

5 files changed

+4
-203
lines changed

5 files changed

+4
-203
lines changed

base/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,6 @@ RUN add-apt-repository -y ppa:dotnet/backports && \
164164

165165
ENV PATH=$PATH:/root/.nuget/tools:/root/.dotnet/tools
166166

167-
# Settings for podman
168-
RUN mkdir -p /etc/containers
169-
COPY *.conf /etc/containers/
170-
VOLUME /var/lib/containers
171-
172167
# Verify installations
173168
RUN printenv
174169
RUN echo "docker: $(docker --version)"
@@ -194,7 +189,7 @@ RUN echo "kustomize: $(kustomize version)"
194189

195190
# Clean up
196191
RUN apt-get clean && \
197-
rm -rf /var/lib/apt/lists/*
192+
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
198193

199194
# Set working directory
200195
WORKDIR /home/jenkins

base/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ Base image with latest common sdks and utilities built with ubuntu, include:
1818
- ks
1919
- ...
2020

21+
**NOTE**
22+
1. Because the image has both docker and podman installed, `docker` command is no longer a alias of `podman`, you should use `podman` command explicitly.
23+

base/containers.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

base/registries.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.

base/storage.conf

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)