From 39442895321d2281e77469f963f2418ffe6509c3 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 8 Jan 2021 22:58:49 +0100 Subject: [PATCH] docker: update headers in Dockerfiles --- packaging/docker/Dockerfile.alpine | 13 ++----------- packaging/docker/Dockerfile.centos | 10 +--------- packaging/docker/Dockerfile.debian | 10 +--------- packaging/docker/Dockerfile.debian-multiarch | 10 +--------- packaging/docker/Dockerfile.fedora | 10 +--------- packaging/docker/Dockerfile.fedora-minimal | 2 +- packaging/docker/Dockerfile.ubuntu | 10 +--------- 7 files changed, 8 insertions(+), 57 deletions(-) diff --git a/packaging/docker/Dockerfile.alpine b/packaging/docker/Dockerfile.alpine index 1d2e71ac3..17ab454e9 100644 --- a/packaging/docker/Dockerfile.alpine +++ b/packaging/docker/Dockerfile.alpine @@ -1,14 +1,5 @@ #syntax=docker/dockerfile:1.2-labs - -# Dockerfile for VILLASnode development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLASnode. -# However, VILLASnode itself it not part of the image. -# -# This image can be used for developing VILLASnode -# by running: -# make docker-dev +# Alpine Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC @@ -109,7 +100,7 @@ WORKDIR /villas/build RUN --security=insecure \ cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DCMAKE_PREFIX_PATH=${PREFIX} .. && \ - make -j$(nproc) install + make -j8 install FROM alpine:edge AS app diff --git a/packaging/docker/Dockerfile.centos b/packaging/docker/Dockerfile.centos index 3a3870412..bc60fce1d 100644 --- a/packaging/docker/Dockerfile.centos +++ b/packaging/docker/Dockerfile.centos @@ -1,12 +1,4 @@ -# Dockerfile for VILLASnode development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLASnode. -# However, VILLASnode itself it not part of the image. -# -# This image can be used for developing VILLASnode -# by running: -# make docker +# CentOS Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index 8bccba0ba..2d3c836ec 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -1,12 +1,4 @@ -# Dockerfile for VILLASnode development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLASnode. -# However, VILLASnode itself it not part of the image. -# -# This image can be used for developing VILLASnode -# by running: -# make docker +# Debian Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 5fd6cfae6..ef4fdffa4 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -1,12 +1,4 @@ -# Dockerfile for VILLASnode development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLASnode. -# However, VILLASnode itself it not part of the image. -# -# This image can be used for developing VILLASnode -# by running: -# make docker +# Debian Multiarch Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index 739a2d9f0..2c19c8f5d 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -1,12 +1,4 @@ -# Dockerfile for VILLASnode development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLASnode. -# However, VILLASnode itself it not part of the image. -# -# This image can be used for developing VILLASnode -# by running: -# make docker-dev +# Fedora Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC diff --git a/packaging/docker/Dockerfile.fedora-minimal b/packaging/docker/Dockerfile.fedora-minimal index 2d6d5810c..a7880ac29 100644 --- a/packaging/docker/Dockerfile.fedora-minimal +++ b/packaging/docker/Dockerfile.fedora-minimal @@ -1,4 +1,4 @@ -# Minimal Dockerfile for building VILLASnode +# Minimal Fedora Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index b34bf1e29..6ac0ff816 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -1,12 +1,4 @@ -# Dockerfile for VILLASnode development. -# -# This Dockerfile builds an image which contains all library dependencies -# and tools to build VILLASnode. -# However, VILLASnode itself it not part of the image. -# -# This image can be used for developing VILLASnode -# by running: -# make docker +# Ubuntu Dockerfile # # @author Steffen Vogel # @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC