diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index a5c305bd1..732f9068d 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -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 # The alpine runner -FROM alpine:3.14 as lemmy +FROM alpine:3 as lemmy # Install libpq for postgres RUN apk add libpq diff --git a/docker/dev/volume_mount.dockerfile b/docker/dev/volume_mount.dockerfile index 0af2a37f6..550d0e23c 100644 --- a/docker/dev/volume_mount.dockerfile +++ b/docker/dev/volume_mount.dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental # 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 @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ RUN --mount=type=cache,target=/app/target \ cp target/debug/lemmy_server lemmy_server -FROM ubuntu:20.10 +FROM ubuntu:20.04 # Install libpq for postgres RUN apt-get update -y diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index c2f05c175..3761ebadc 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: nginx: - image: nginx:1.17-alpine + image: nginx:1-alpine ports: - "8540:8540" - "8550:8550" diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index dedd5ac0e..2f3d278a9 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -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 # The alpine runner -FROM alpine:3.14 as lemmy +FROM alpine:3 as lemmy # Install libpq for postgres RUN apk add libpq diff --git a/docker/prod/Dockerfile.arm b/docker/prod/Dockerfile.arm index 539a2ae72..a4bcb2603 100644 --- a/docker/prod/Dockerfile.arm +++ b/docker/prod/Dockerfile.arm @@ -1,4 +1,4 @@ -ARG RUST_BUILDER_IMAGE=rust:1.51.0-slim-buster +ARG RUST_BUILDER_IMAGE=rust:1-slim # Build Lemmy FROM $RUST_BUILDER_IMAGE as builder