Skip to content

Commit

Permalink
MEGA FIX BUILD #1 (#776)
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCat15352 authored Jun 22, 2024
1 parent bf0ec1d commit d657fd3
Show file tree
Hide file tree
Showing 703 changed files with 72,669 additions and 135,624 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM beestation/byond:515.1616 as base
FROM beestation/byond:515.1633 as base

# Install the tools needed to compile our rust dependencies
FROM base as rust-build
Expand All @@ -12,8 +12,8 @@ RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
curl ca-certificates gcc-multilib \
g++-multilib libc6-i386 zlib1g-dev:i386 \
libssl-dev:i386 pkg-config:i386 git \
clang g++-multilib libc6-i386 \
zlib1g-dev:i386 pkg-config:i386 git \
&& /bin/bash -c "source dependencies.sh \
&& curl https://sh.rustup.rs | sh -s -- -y -t i686-unknown-linux-gnu --no-modify-path --profile minimal --default-toolchain \$RUST_VERSION" \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -25,7 +25,7 @@ RUN git init \
&& /bin/bash -c "source dependencies.sh \
&& git fetch --depth 1 origin \$RUST_G_VERSION" \
&& git checkout FETCH_HEAD \
&& cargo build --release --all-features --target i686-unknown-linux-gnu
&& cargo build --release --target i686-unknown-linux-gnu

# Build auxmos
FROM rust-build as auxmos
Expand All @@ -34,7 +34,7 @@ RUN git init \
&& git remote add origin \$AUXMOS_REPO \
&& git fetch --depth 1 origin \$AUXMOS_VERSION" \
&& git checkout FETCH_HEAD \
&& cargo rustc --target=i686-unknown-linux-gnu --release --features all_reaction_hooks,katmos -- -C target-cpu=native
&& env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"

# Install nodejs which is required to deploy Shiptest
FROM base as node
Expand Down
Loading

0 comments on commit d657fd3

Please sign in to comment.