[#24] Second attempt (failed)

master^2
Jef Roosens 2021-04-16 23:20:22 +02:00
parent d5a513482a
commit fd7a3e2331
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
5 changed files with 17 additions and 3 deletions

View File

@ -6,3 +6,6 @@
# Cargo files
!Cargo.toml
!Cargo.lock
# Entrypoint for devop container
!docker/entrypoint_dev.sh

View File

@ -8,8 +8,9 @@ ENV RUSTFLAGS "-C target-feature=-crt-static"
WORKDIR /usr/src/app
# Install build dependencies, rustup & rust's nightly build & toolchain
RUN apk update && apk add --no-cache openssl-dev build-base curl libpq && \
{ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; }
RUN apk update && apk add --no-cache openssl-dev curl libpq libgcc musl-dev gcc && \
{ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
rustup target add x86_64-unknown-linux-musl --toolchain nightly
# Copy source code over to builder
COPY Cargo.toml Cargo.lock ./

View File

@ -2,5 +2,7 @@ FROM chewingbever/fej-builder:latest
ENV RUST_BACKTRACE 1
ENTRYPOINT ["cargo"]
COPY ./docker/entrypoint_dev.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["run", "--bin", "server"]

View File

@ -0,0 +1,4 @@
#!/usr/bin/env sh
# All this file does is inject the target
cargo "$@" --target x86_64-unknown-linux-musl

4
fejctl
View File

@ -28,6 +28,10 @@ function create_images() {
#
# $@: the arguments to pass to the image (passed as arguments to cargo)
function run_image() {
docker volume create fej_build-cache
docker volume create fej_registry-cache
docker volume create fej_db-data
# Run the database image
docker run --rm \
--detach \