Skip to content

Commit 8f409f0

Browse files
committed
chore: upgrade base image to bulleye
fix dockerfile fix fix package add package fix nfs package fix nfs install chore: fix local image build fix vuln
1 parent fdde9fa commit 8f409f0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ blob-darwin:
108108

109109
.PHONY: container
110110
container: blob
111-
docker build -t $(IMAGE_TAG) -f ./pkg/blobplugin/dev.Dockerfile .
111+
docker build -t $(IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/dev.Dockerfile .
112112

113113
.PHONY: container-linux
114114
container-linux:

pkg/blobplugin/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG ARCH
16-
17-
FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0
15+
FROM k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
1816
COPY ./_output/blobplugin /blobplugin
19-
RUN apt-get update && clean-install ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev wget
17+
RUN apt update && apt-mark unhold libcap2
18+
RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev util-linux mount udev wget e2fsprogs nfs-common libssl1.1
2019
RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt install blobfuse fuse -y && rm -f /tmp/packages-microsoft-prod.deb
20+
# this is a workaround to install nfs-kernel-server and don't quit with error
21+
RUN apt install nfs-kernel-server -y || true
2122
RUN apt remove wget -y
22-
# this is a workaround to install nfs-common & nfs-kernel-server and don't quit with error
23-
RUN apt-get update && apt install nfs-common nfs-kernel-server -y || true
2423
LABEL maintainers="andyzhangx"
2524
LABEL description="Azure Blob Storage CSI driver"
2625

2726
ENTRYPOINT ["/blobplugin"]
27+

0 commit comments

Comments
 (0)