Use more generic docker deps. Fixes #1759

fix_docker_deps
Dessalines 2021-08-31 16:39:35 -04:00
parent 46b223e3c5
commit a2c2e611b5
5 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -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-slim 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

View File

@ -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"

View File

@ -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

View File

@ -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