Skip to content

Commit

Permalink
fix dockerfile build
Browse files Browse the repository at this point in the history
Summary: Fixes the cinder dockerfile, which also fixes the cinder explorer at trycinder.com

Reviewed By: alexmalyshev

Differential Revision: D54721448

fbshipit-source-id: 23f333260142960fc7d5d63393b18d1ab2d42450
  • Loading branch information
pilleye authored and facebook-github-bot committed Mar 11, 2024
1 parent a594bc4 commit f3f3a46
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/cinder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ENV MAKE_JOBS="${make_jobs}" MAKE_VERBOSE="${make_verbose:-1}"
WORKDIR /cinder/build
COPY --chmod=r . /cinder/src
RUN cp /cinder/src/oss-cinder-test.sh /cinder/build/
RUN /cinder/src/configure --prefix=/cinder
RUN /cinder/src/configure --prefix=/cinder --enable-cinderx-module
RUN make -j${MAKE_JOBS:-$( nproc )} VERBOSE=$MAKE_VERBOSE

# The "install" image - install the built Python and discard the source and build trees
Expand Down
4 changes: 4 additions & 0 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -1673,6 +1673,10 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
cp -r $(srcdir)/cinderx/cinderx/ $(DESTDIR)$(LIBDEST)
cp -r $(srcdir)/cinderx/__static__/ $(DESTDIR)$(LIBDEST)
cp -r $(srcdir)/cinderx/__strict__/ $(DESTDIR)$(LIBDEST)
cp '$(abs_builddir)/$(shell cat "$(abs_builddir)/pybuilddir.txt")/_cinderx.$(SOABI).so' $(DESTDIR)$(LIBDEST)
@if test "$(TEST_MODULES)" = yes; then \
subdirs="$(LIBSUBDIRS) $(TESTSUBDIRS)"; \
else \
Expand Down

0 comments on commit f3f3a46

Please sign in to comment.