Skip to content

Commit

Permalink
Don't assume sysbox-fs FUSE dir is at /var/lib/sysboxfs.
Browse files Browse the repository at this point in the history
The location of the sysbox-fs FUSE dir is configurable
via the sysbox-fs command line. Thus, do not assume
it's under the default location ("/var/lib/sysboxfs")
and instead let sysbox-fs determine its location.

Related to sysbox issue #310.

Signed-off-by: Cesar Talledo <ctalledo@nestybox.com>
  • Loading branch information
ctalledo committed Jul 7, 2021
1 parent 56705a3 commit 6bb12b1
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 16 deletions.
2 changes: 0 additions & 2 deletions scr/sysbox
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ function sysbox_mgr_start() {

function sysbox_fs_start() {

mkdir -p /var/lib/sysboxfs

declare -a fs_options=("--log /var/log/sysbox-fs.log")

if [ $TEST_MODE -eq 1 ]; then
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.centos-8
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ RUN go get github.com/go-delve/delve/cmd/dlv
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.debian-bullseye
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ RUN go get github.com/go-delve/delve/cmd/dlv
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.debian-buster
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ RUN go get github.com/go-delve/delve/cmd/dlv
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.fedora-31
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ RUN go get github.com/go-delve/delve/cmd/dlv
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.fedora-32
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ RUN go get github.com/go-delve/delve/cmd/dlv
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.ubuntu-bionic
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ RUN curl -s https://api.github.com/repos/tomwright/dasel/releases/latest | grep
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down
3 changes: 1 addition & 2 deletions tests/Dockerfile.ubuntu-focal
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ RUN curl -s https://api.github.com/repos/tomwright/dasel/releases/latest | grep
RUN sed -i 's/^#define SECCOMP_IOCTL_NOTIF_ID_VALID[ \t]*SECCOMP_IOW(2, __u64)/#define SECCOMP_IOCTL_NOTIF_ID_VALID SECCOMP_IOR(2, __u64)/g' /usr/include/linux/seccomp.h

# sysbox env
RUN useradd sysbox \
&& mkdir -p /var/lib/sysboxfs
RUN useradd sysbox

# test scripts
COPY scr/testContainerInit /usr/bin
Expand Down

0 comments on commit 6bb12b1

Please sign in to comment.