From 96ba9905a8772859ce5323f25192124cd63ab0d2 Mon Sep 17 00:00:00 2001 From: lnkr Date: Thu, 5 May 2022 11:39:54 +0300 Subject: [PATCH] Update 'Dockerfile' --- Dockerfile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index eca8065..42f3538 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,24 @@ +# Refer to https://github.com/rust-lang/docker-rust-nightly/blob/master/debian-slim/Dockerfile +# Debian was the better choice and you're about to make a mistake #ARG DEBIAN_VERSION #FROM debian:${DEBIAN_VERSION}-slim + +# - BASED? BASED ON WHAT? +# - based on Ubuntu 22.04 LTS «Jammy Jellyfish» FROM ubuntu:jammy +# rust paths ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH + RUN set -eux; \ apt update; \ apt install -y --no-install-recommends \ - ca-certificates \ - gcc \ - libc6-dev \ - wget \ + ca-certificates gcc libc6-dev wget \ + ### https://github.com/emilk/eframe_template requirements + libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev ; \ dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ @@ -24,7 +30,8 @@ RUN set -eux; \ url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init"; \ wget "$url"; \ chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --default-toolchain nightly --target x86_64-pc-windows-gnu; \ + ./rustup-init -y --no-modify-path --default-toolchain nightly \ + --target x86_64-pc-windows-gnu; \ rm rustup-init; \ chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ rustup --version; \ @@ -32,6 +39,8 @@ RUN set -eux; \ rustc --version; \ \ apt remove -y --auto-remove \ + ### ditch the wget who needs that wget \ ; \ + ### wipe apt cache rm -rf /var/lib/apt/lists/*; \ No newline at end of file