Use more generic docker deps. Fixes #1759 (#1762)

* Use more generic docker deps. Fixes #1759

* Don't use slim

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index a5c305bd1afc8114cef5f91ec3a1a8cd9908d564..732f9068dee5b61716bbc0bdd06797943946ec15 100644 (file)
--- 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 0af2a37f60a131f713a14a9e3780697071f9f407..52ff5e82e8fab1ca1f2c7d84b3fe191992de4ea0 100644 (file)
--- 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 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 c2f05c175189e7a2495e1836479eca9b0e26553f..3761ebadce0ab518aaab8c4c865bab8b2b6a0a60 100644 (file)
--- 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 dedd5ac0ed915be613636229e038fddf27100128..2f3d278a92c55f82fb0aeee2522b2251e4e29968 100644 (file)
--- 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 539a2ae721e50fa8bdbd4d7430c699761dc0783b..a4bcb2603728cdc75f81174355391a355f86fe47 100644 (file)
--- 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