* Use more generic docker deps. Fixes #1759 * Don't use slim
This commit is contained in:
parent
c28c1b4bb3
commit
c654aa3416
5 changed files with 6 additions and 6 deletions
|
@ -45,7 +45,7 @@ RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
||||||
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
|
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
|
||||||
|
|
||||||
# The alpine runner
|
# The alpine runner
|
||||||
FROM alpine:3.14 as lemmy
|
FROM alpine:3 as lemmy
|
||||||
|
|
||||||
# Install libpq for postgres
|
# Install libpq for postgres
|
||||||
RUN apk add libpq
|
RUN apk add libpq
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# syntax=docker/dockerfile:experimental
|
# syntax=docker/dockerfile:experimental
|
||||||
|
|
||||||
# Warning: this will not pick up migrations unless there are code changes
|
# Warning: this will not pick up migrations unless there are code changes
|
||||||
FROM rust:1.51-buster as rust
|
FROM rust:1 as rust
|
||||||
|
|
||||||
ENV HOME=/home/root
|
ENV HOME=/home/root
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
|
||||||
RUN --mount=type=cache,target=/app/target \
|
RUN --mount=type=cache,target=/app/target \
|
||||||
cp target/debug/lemmy_server lemmy_server
|
cp target/debug/lemmy_server lemmy_server
|
||||||
|
|
||||||
FROM ubuntu:20.10
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
# Install libpq for postgres
|
# Install libpq for postgres
|
||||||
RUN apt-get update -y
|
RUN apt-get update -y
|
||||||
|
|
|
@ -2,7 +2,7 @@ version: '3.3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
nginx:
|
nginx:
|
||||||
image: nginx:1.17-alpine
|
image: nginx:1-alpine
|
||||||
ports:
|
ports:
|
||||||
- "8540:8540"
|
- "8540:8540"
|
||||||
- "8550:8550"
|
- "8550:8550"
|
||||||
|
|
|
@ -18,7 +18,7 @@ RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
||||||
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
|
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/lemmy_server
|
||||||
|
|
||||||
# The alpine runner
|
# The alpine runner
|
||||||
FROM alpine:3.14 as lemmy
|
FROM alpine:3 as lemmy
|
||||||
|
|
||||||
# Install libpq for postgres
|
# Install libpq for postgres
|
||||||
RUN apk add libpq
|
RUN apk add libpq
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG RUST_BUILDER_IMAGE=rust:1.51.0-slim-buster
|
ARG RUST_BUILDER_IMAGE=rust:1-slim
|
||||||
|
|
||||||
# Build Lemmy
|
# Build Lemmy
|
||||||
FROM $RUST_BUILDER_IMAGE as builder
|
FROM $RUST_BUILDER_IMAGE as builder
|
||||||
|
|
Loading…
Reference in a new issue