diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 1b8edc3ea..8d009eb39 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -305,6 +305,8 @@ jobs: # needs it. - name: build docker image run: make runcimage + - name: smoke test docker image + run: make integration TESTPATH=/run.bats - name: make releaseall run: make releaseall - name: upload artifacts diff --git a/Dockerfile b/Dockerfile index bfe0a6cba..e70184bd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,9 @@ RUN mkdir -p $DYLIB_DIR \ && /tmp/script/build-libpathrs.sh "$LIBPATHRS_VERSION" $DYLIB_DIR $RELEASE_ARCHES ENV LIBPATHRS_VERSION=$LIBPATHRS_VERSION -ENV LD_LIBRARY_PATH=$DYLIB_DIR/lib +# Use ldconfig rather than LD_LIBRARY_PATH, since runc init does not inherit +# the environment. +RUN echo "$DYLIB_DIR/lib" > /etc/ld.so.conf.d/runc-dylibs.conf && ldconfig ENV PKG_CONFIG_PATH=$DYLIB_DIR/lib/pkgconfig # Prevent the "fatal: detected dubious ownership in repository" git complain during build.