Skip to content

Commit

Permalink
Merge branch 'main' into libacl
Browse files Browse the repository at this point in the history
  • Loading branch information
Floppy authored Dec 10, 2024
2 parents c8fc13d + 1ce65f8 commit bff9856
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 30 deletions.
3 changes: 0 additions & 3 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ description: Set up Manyfold build environment
runs:
using: composite
steps:
- uses: awalsh128/cache-apt-pkgs-action@v1
with:
packages: libglfw3
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ To run the app yourself, you'll need the following installed:
* Yarn >= 1.22
* Foreman or [another Procfile runner](https://github.com/ddollar/foreman#ports)
* [libarchive](https://github.com/chef/ffi-libarchive#installation) (for upload support)
* [glfw3](https://github.com/danini-the-panini/mittsu#installation) (for model analysis & manipulation)

To run the application once you've cloned this repo, you should be able to just run `bin/dev`; that should set up the database, perform migrations, install dependencies, and then make the application available at <http://127.0.0.1:5000>.

Expand Down
4 changes: 1 addition & 3 deletions docker/build.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ RUN apk add --no-cache \
postgresql-dev \
mariadb-dev \
acl-libs \
libarchive \
mesa-gl \
glfw
libarchive

COPY package.json .
COPY yarn.lock .
Expand Down
23 changes: 0 additions & 23 deletions docker/runtime.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,6 @@ COPY --from=build \
/usr/lib/liblz4.so.* \
/usr/lib/libbz2.so.* \
/usr/lib/libpq.so.* \
/usr/lib/libGL.so.* \
/usr/lib/libglapi.so.* \
/usr/lib/libdrm.so.* \
/usr/lib/libX11.so.* \
/usr/lib/libxcb-glx.so.* \
/usr/lib/libxcb.so.* \
/usr/lib/libX11-xcb.so.* \
/usr/lib/libxcb-dri2.so.* \
/usr/lib/libXext.so.* \
/usr/lib/libXfixes.so.* \
/usr/lib/libXxf86vm.so.* \
/usr/lib/libxcb-shm.so.* \
/usr/lib/libxshmfence.so.* \
/usr/lib/libxcb-dri3.so.* \
/usr/lib/libxcb-present.so.* \
/usr/lib/libxcb-sync.so.* \
/usr/lib/libxcb-xfixes.so.* \
/usr/lib/libxcb-randr.so.* \
/usr/lib/libXau.so.* \
/usr/lib/libXdmcp.so.* \
/usr/lib/libbsd.so.* \
/usr/lib/libmd.so.* \
/usr/lib/libglfw.so.* \
/usr/lib

# Set up jemalloc and YJIT for performance
Expand Down

0 comments on commit bff9856

Please sign in to comment.