Skip to content

Commit

Permalink
Update the AppImage docker to Ubuntu 20.04
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigorc committed May 17, 2024
1 parent 0af054d commit 4409152
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "papercraft"
version = "2.5.0"
version = "2.6.0"
authors = ["Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>"]
edition = "2021"
license = "GPL-3.0-or-later"
Expand Down
6 changes: 5 additions & 1 deletion distro/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 ./
12 changes: 12 additions & 0 deletions distro/docker/g++
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
argc=$#
argv=("$@")

for (( j=0; j<argc; j++ )); do
if [ "${argv[j]}" = "-std=c++20" ]
then
argv[j]="-std=c++2a"
fi
done

exec /usr/bin/g++ "${argv[@]}"
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ impl GlobalContext {
center_url(ui, env!("CARGO_PKG_REPOSITORY"), "url", None, sz_full.x);
advance_cursor(ui, 0.0, 0.5);
ui.with_push(self.font_small, || {
center_text(ui, "© Copyright 2022 - Rodrigo Rivas Costa", sz_full.x);
center_text(ui, "© Copyright 2024 - Rodrigo Rivas Costa", sz_full.x);
center_text(
ui,
"This program comes with absolutely no warranty.",
Expand Down

0 comments on commit 4409152

Please sign in to comment.