Removing some commented lines from the dockerfile.
This commit is contained in:
parent
983a45e178
commit
132e3534de
4 changed files with 0 additions and 261 deletions
10
docker/prod/Dockerfile
vendored
10
docker/prod/Dockerfile
vendored
|
|
@ -18,18 +18,10 @@ RUN cargo build --release
|
||||||
RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
|
RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
|
||||||
COPY --chown=rust:rust server/src ./src/
|
COPY --chown=rust:rust server/src ./src/
|
||||||
COPY --chown=rust:rust server/migrations ./migrations/
|
COPY --chown=rust:rust server/migrations ./migrations/
|
||||||
#USER root
|
|
||||||
#RUN sudo chown -R rust:rust /app/server
|
|
||||||
#USER rust
|
|
||||||
|
|
||||||
# build for release
|
# build for release
|
||||||
# workaround for https://github.com/rust-lang/rust/issues/62896
|
# workaround for https://github.com/rust-lang/rust/issues/62896
|
||||||
#RUN RUSTFLAGS='-Ccodegen-units=1' cargo build --release
|
|
||||||
RUN cargo build --frozen --release
|
RUN cargo build --frozen --release
|
||||||
#RUN cargo build --release
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
# reduce binary size
|
# reduce binary size
|
||||||
RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
||||||
|
|
@ -39,10 +31,8 @@ RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/server/
|
||||||
FROM $RUST_BUILDER_IMAGE as docs
|
FROM $RUST_BUILDER_IMAGE as docs
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --chown=rust:rust docs ./docs
|
COPY --chown=rust:rust docs ./docs
|
||||||
#RUN sudo chown -R rust:rust .
|
|
||||||
RUN mdbook build docs/
|
RUN mdbook build docs/
|
||||||
|
|
||||||
|
|
||||||
FROM node:12-buster as node
|
FROM node:12-buster as node
|
||||||
|
|
||||||
WORKDIR /app/ui
|
WORKDIR /app/ui
|
||||||
|
|
|
||||||
80
docker/prod/docker_old/Dockerfile.aarch64
vendored
80
docker/prod/docker_old/Dockerfile.aarch64
vendored
|
|
@ -1,80 +0,0 @@
|
||||||
FROM node:10-jessie as node
|
|
||||||
|
|
||||||
WORKDIR /app/ui
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
COPY ui/package.json ui/yarn.lock ./
|
|
||||||
RUN yarn install --pure-lockfile
|
|
||||||
|
|
||||||
# Build
|
|
||||||
COPY ui /app/ui
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
|
|
||||||
# contains qemu-*-static for cross-compilation
|
|
||||||
FROM multiarch/qemu-user-static as qemu
|
|
||||||
|
|
||||||
|
|
||||||
FROM arm64v8/rust:1.40-buster as rust
|
|
||||||
|
|
||||||
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
|
|
||||||
#COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
|
|
||||||
|
|
||||||
# Install musl
|
|
||||||
#RUN apt-get update && apt-get install -y mc
|
|
||||||
#RUN apt-get install -y musl-tools mc
|
|
||||||
#libpq-dev mc
|
|
||||||
#RUN rustup target add ${TARGET}
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
WORKDIR /app
|
|
||||||
RUN USER=root cargo new server
|
|
||||||
WORKDIR /app/server
|
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
|
||||||
RUN mkdir -p ./src/bin \
|
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
|
||||||
RUN cargo build --release
|
|
||||||
# RUN cargo build
|
|
||||||
COPY server/src ./src/
|
|
||||||
COPY server/migrations ./migrations/
|
|
||||||
RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
|
||||||
|
|
||||||
# build for release
|
|
||||||
RUN cargo build --frozen --release
|
|
||||||
|
|
||||||
# reduce binary size
|
|
||||||
RUN strip /app/server/target/release/lemmy_server
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
# RUN cp /app/server/target/debug/lemmy_server /app/server/ready
|
|
||||||
RUN cp /app/server/target/release/lemmy_server /app/server/ready
|
|
||||||
|
|
||||||
#FROM alpine:3.10
|
|
||||||
# debian because build with dynamic linking with debian:buster
|
|
||||||
FROM arm64v8/debian:buster-slim as lemmy
|
|
||||||
|
|
||||||
#COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
|
|
||||||
|
|
||||||
# Install libpq for postgres
|
|
||||||
#RUN apk add libpq
|
|
||||||
RUN apt-get update && apt-get install -y libpq5
|
|
||||||
|
|
||||||
RUN addgroup --gid 1000 lemmy
|
|
||||||
# for alpine
|
|
||||||
#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|
||||||
# for debian
|
|
||||||
RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
|
|
||||||
|
|
||||||
# Copy resources
|
|
||||||
COPY server/config/defaults.hjson /config/defaults.hjson
|
|
||||||
COPY --from=rust /app/server/ready /app/lemmy
|
|
||||||
COPY --from=node /app/ui/dist /app/dist
|
|
||||||
|
|
||||||
RUN chown lemmy:lemmy /app/lemmy
|
|
||||||
USER lemmy
|
|
||||||
EXPOSE 8536
|
|
||||||
CMD ["/app/lemmy"]
|
|
||||||
81
docker/prod/docker_old/Dockerfile.armv7hf
vendored
81
docker/prod/docker_old/Dockerfile.armv7hf
vendored
|
|
@ -1,81 +0,0 @@
|
||||||
FROM node:10-jessie as node
|
|
||||||
|
|
||||||
WORKDIR /app/ui
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
COPY ui/package.json ui/yarn.lock ./
|
|
||||||
RUN yarn install --pure-lockfile
|
|
||||||
|
|
||||||
# Build
|
|
||||||
COPY ui /app/ui
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
|
|
||||||
# contains qemu-*-static for cross-compilation
|
|
||||||
FROM multiarch/qemu-user-static as qemu
|
|
||||||
|
|
||||||
|
|
||||||
FROM arm32v7/rust:1.37-buster as rust
|
|
||||||
|
|
||||||
#COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
|
|
||||||
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
|
|
||||||
|
|
||||||
# Install musl
|
|
||||||
#RUN apt-get update && apt-get install -y mc
|
|
||||||
#RUN apt-get install -y musl-tools mc
|
|
||||||
#libpq-dev mc
|
|
||||||
#RUN rustup target add ${TARGET}
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
WORKDIR /app
|
|
||||||
RUN USER=root cargo new server
|
|
||||||
WORKDIR /app/server
|
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
|
||||||
RUN mkdir -p ./src/bin \
|
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
|
||||||
#RUN cargo build --release
|
|
||||||
# RUN cargo build
|
|
||||||
RUN RUSTFLAGS='-Ccodegen-units=1' cargo build
|
|
||||||
COPY server/src ./src/
|
|
||||||
COPY server/migrations ./migrations/
|
|
||||||
RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
|
||||||
|
|
||||||
|
|
||||||
# build for release
|
|
||||||
RUN cargo build --frozen --release
|
|
||||||
|
|
||||||
# reduce binary size
|
|
||||||
RUN strip /app/server/target/debug/lemmy_server
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
RUN cp /app/server/target/debug/lemmy_server /app/server/ready
|
|
||||||
#RUN cp /app/server/target/release/lemmy_server /app/server/ready
|
|
||||||
|
|
||||||
#FROM alpine:3.10
|
|
||||||
# debian because build with dynamic linking with debian:buster
|
|
||||||
FROM arm32v7/debian:buster-slim as lemmy
|
|
||||||
|
|
||||||
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
|
|
||||||
# Install libpq for postgres
|
|
||||||
#RUN apk add libpq
|
|
||||||
RUN apt-get update && apt-get install -y libpq5
|
|
||||||
|
|
||||||
RUN addgroup --gid 1000 lemmy
|
|
||||||
# for alpine
|
|
||||||
#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|
||||||
# for debian
|
|
||||||
RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
|
|
||||||
|
|
||||||
# Copy resources
|
|
||||||
COPY server/config/defaults.hjson /config/defaults.hjson
|
|
||||||
COPY --from=rust /app/server/ready /app/lemmy
|
|
||||||
COPY --from=node /app/ui/dist /app/dist
|
|
||||||
|
|
||||||
RUN chown lemmy:lemmy /app/lemmy
|
|
||||||
USER lemmy
|
|
||||||
EXPOSE 8536
|
|
||||||
CMD ["/app/lemmy"]
|
|
||||||
90
docker/prod/docker_old/Dockerfile.libc
vendored
90
docker/prod/docker_old/Dockerfile.libc
vendored
|
|
@ -1,90 +0,0 @@
|
||||||
# can be build on x64, arm32, arm64 platforms
|
|
||||||
# to build on target platform run
|
|
||||||
# docker build -f Dockerfile.libc -t dessalines/lemmy:version ../..
|
|
||||||
#
|
|
||||||
# to use docker buildx run
|
|
||||||
# docker buildx build --platform linux/amd64,linux/arm64 -f Dockerfile.libc -t YOURNAME/lemmy --push ../..
|
|
||||||
|
|
||||||
FROM node:12-buster as node
|
|
||||||
# use this if use docker buildx
|
|
||||||
#FROM --platform=$BUILDPLATFORM node:12-buster as node
|
|
||||||
|
|
||||||
WORKDIR /app/ui
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
COPY ui/package.json ui/yarn.lock ./
|
|
||||||
RUN yarn install --pure-lockfile --network-timeout 100000
|
|
||||||
|
|
||||||
# Build
|
|
||||||
COPY ui /app/ui
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
|
|
||||||
FROM rust:1.42 as rust
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
RUN USER=root cargo new server
|
|
||||||
WORKDIR /app/server
|
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
|
||||||
RUN mkdir -p ./src/bin \
|
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
|
||||||
|
|
||||||
|
|
||||||
RUN cargo build --release
|
|
||||||
#RUN cargo build && \
|
|
||||||
# rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
|
||||||
COPY server/src ./src/
|
|
||||||
COPY server/migrations ./migrations/
|
|
||||||
|
|
||||||
|
|
||||||
# build for release
|
|
||||||
# workaround for https://github.com/rust-lang/rust/issues/62896
|
|
||||||
#RUN RUSTFLAGS='-Ccodegen-units=1' cargo build --release
|
|
||||||
RUN cargo build --release --frozen
|
|
||||||
|
|
||||||
# reduce binary size
|
|
||||||
RUN strip /app/server/target/release/lemmy_server
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
# make result place always the same for lemmy container
|
|
||||||
RUN cp /app/server/target/release/lemmy_server /app/server/ready
|
|
||||||
#RUN cp /app/server/target/debug/lemmy_server /app/server/ready
|
|
||||||
|
|
||||||
|
|
||||||
FROM rust:1.42 as docs
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Build docs
|
|
||||||
COPY docs ./docs
|
|
||||||
RUN cargo install mdbook
|
|
||||||
RUN mdbook build docs/
|
|
||||||
|
|
||||||
|
|
||||||
#FROM alpine:3.10
|
|
||||||
# debian because build with dynamic linking with debian:buster
|
|
||||||
FROM debian:buster as lemmy
|
|
||||||
|
|
||||||
# Install libpq for postgres
|
|
||||||
#RUN apk add libpq
|
|
||||||
RUN apt-get update && apt-get install -y libpq5
|
|
||||||
RUN addgroup --gid 1000 lemmy
|
|
||||||
# for alpine
|
|
||||||
#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|
||||||
# for debian
|
|
||||||
RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
|
|
||||||
|
|
||||||
# Copy resources
|
|
||||||
COPY server/config/defaults.hjson /config/defaults.hjson
|
|
||||||
COPY --from=node /app/ui/dist /app/dist
|
|
||||||
COPY --from=docs /app/docs/book/ /app/dist/documentation/
|
|
||||||
COPY --from=rust /app/server/ready /app/lemmy
|
|
||||||
|
|
||||||
RUN chown lemmy:lemmy /app/lemmy
|
|
||||||
USER lemmy
|
|
||||||
EXPOSE 8536
|
|
||||||
CMD ["/app/lemmy"]
|
|
||||||
Loading…
Reference in a new issue