diff --git a/Cargo.toml b/Cargo.toml index 4e24110..fe50f10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "papercraft" -version = "2.5.0" +version = "2.6.0" authors = ["Rodrigo Rivas Costa "] edition = "2021" license = "GPL-3.0-or-later" diff --git a/distro/docker/Dockerfile b/distro/docker/Dockerfile index 8616a43..e387c1f 100644 --- a/distro/docker/Dockerfile +++ b/distro/docker/Dockerfile @@ -1,11 +1,15 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 WORKDIR /app +RUN ln -sf /usr/share/zoneinfo/Europe/Madrid /etc/localtime RUN apt -y update RUN apt -y upgrade RUN apt -y install curl gcc pkg-config xz-utils fuse libclang-dev file libfreetype6-dev +RUN apt -y install g++ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.rs # Rust 1.76 RUN sh rustup.rs -y --profile minimal -c rustfmt +copy g++ /usr/local/bin/g++ +copy g++ /usr/local/bin/c++ COPY linuxdeploy ./ COPY makeappimage ./ COPY apprun ./ diff --git a/distro/docker/g++ b/distro/docker/g++ new file mode 100755 index 0000000..2479168 --- /dev/null +++ b/distro/docker/g++ @@ -0,0 +1,12 @@ +#!/bin/bash +argc=$# +argv=("$@") + +for (( j=0; j