Skip to content

Commit afe8808

Browse files
plugincontainer: fix image build (#129)
* plugincontainer: fix image build Lock the image version used in test, and switch to available commands
1 parent 90fcdf1 commit afe8808

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
(
5050
set -e
5151
ARCH="$(uname -m)"
52-
URL="https://storage.googleapis.com/gvisor/releases/release/latest/${ARCH}"
52+
URL="https://storage.googleapis.com/gvisor/releases/release/20240311/${ARCH}"
5353
wget --quiet "${URL}/runsc" "${URL}/runsc.sha512" \
5454
"${URL}/containerd-shim-runsc-v1" "${URL}/containerd-shim-runsc-v1.sha512"
5555
sha512sum -c runsc.sha512 \

plugincontainer/examples/container/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ COPY go-plugin-counter /bin/go-plugin-counter
77

88
ENTRYPOINT [ "/bin/go-plugin-counter" ]
99

10-
FROM docker.mirror.hashicorp.services/ubuntu as nonroot
10+
# This is docker.mirror.hashicorp.services/ubuntu:24.04 as of 2024-07-31.
11+
FROM docker.mirror.hashicorp.services/ubuntu@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 as nonroot
1112

1213
COPY go-plugin-counter /bin/go-plugin-counter
1314

1415
RUN apt-get update && apt-get install -y libcap2-bin acl && \
15-
addgroup --system nonroot && \
16-
adduser --system --ingroup nonroot nonroot && \
16+
groupadd --system nonroot && \
17+
useradd --system -g nonroot nonroot && \
1718
chown -R nonroot:nonroot /bin/go-plugin-counter && \
1819
cp /bin/go-plugin-counter /bin/go-plugin-counter-mlock && \
1920
setcap cap_ipc_lock=+ep /bin/go-plugin-counter-mlock
@@ -27,4 +28,4 @@ FROM nonroot as nonroot-mlock
2728
ENTRYPOINT [ "/bin/go-plugin-counter-mlock" ]
2829

2930
# Set root as the default image.
30-
FROM root
31+
FROM root

0 commit comments

Comments
 (0)