From 7fddfe0fe93b9388a5bb074d7b6445be338404c8 Mon Sep 17 00:00:00 2001 From: Stefan Venz Date: Tue, 23 Mar 2021 11:44:27 +0100 Subject: [PATCH] base: cleanup and version bump - Remove obsolete documentation - Change Ubuntu version from 18.04 -> 20.04 - Increase build version Signed-off-by: Stefan Venz --- Docker/Dockerfile | 7 ++----- Docker/README.md | 23 ----------------------- Makefile | 2 +- deps | 4 ---- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 Docker/README.md delete mode 100644 deps diff --git a/Docker/Dockerfile b/Docker/Dockerfile index a0f7677..0d0d7fd 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,13 +1,10 @@ -FROM ubuntu:18.04 as base - -MAINTAINER FilipS (filips@vaskir.co) +FROM ubuntu:20.04 as base #Disable interactive tzdata instalaltion ARG DEBIAN_FRONTEND=noninteractive - RUN apt update && \ - apt install -y make texlive-full latex2html + apt install -y make texlive-full latex2html ARG UID=1000 ARG GID=1000 diff --git a/Docker/README.md b/Docker/README.md deleted file mode 100644 index 3aff0bc..0000000 --- a/Docker/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Build BlackArch guide/docs with docker - - -## Building the docker image - - -From the root of project, execute: - -`docker build -t blackarchdocs . -f Docker/Dockerfile` - -## Running the build - -`docker run --name docs -it blackarchdocs make build pdf; docker cp docs:/build/*.pdf /tmp` - -Where **/tmp** is destination where the build folder will be copied, end result would be `/tmp/build/` - - - -Notice* - -If you look at the Dockerfile, most languages and LateX dependencies are tried to be covered, feel free to install missing one if you are submiting your language. - -In the build process, the build is using "make build pdf" instruction covered by Makefile, but it is possible to call gen.sh. diff --git a/Makefile b/Makefile index 8fd862f..677f32c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL = /bin/sh .PHONY: all build clean deps html install -VERSION?=1.1 +VERSION?=1.2 # We only care about tex files at the moment so clear and explictly denote that .SUFFIXES: diff --git a/deps b/deps deleted file mode 100644 index 4652f03..0000000 --- a/deps +++ /dev/null @@ -1,4 +0,0 @@ -texlive-core -texlive-latexextra -texlive-pstricks -latex2html