From 94fb458645ab4dcee7b122474758bb961bdea306 Mon Sep 17 00:00:00 2001
From: Roger Sikorski <roger@sikorski.cloud>
Date: Sun, 12 Nov 2023 17:44:32 +0100
Subject: [PATCH] fixed paths and added unp (#8)

Reviewed-on: https://gitea.sikorski.cloud/RogerSik/docker-devops-helper/pulls/8
---
 .gitea/workflows/dev_alpine.yaml         | 4 ++--
 .gitea/workflows/dev_ubuntu.yaml         | 4 ++--
 .gitea/workflows/main_alpine.yaml        | 4 ++--
 .gitea/workflows/main_ubuntu.yaml        | 4 ++--
 .hadolint.yaml                           | 6 +++++-
 README.md                                | 9 ++++++---
 dockerfile/{alpine/Dockerfile => alpine} | 0
 dockerfile/{ubuntu/Dockerfile => ubuntu} | 2 +-
 8 files changed, 20 insertions(+), 13 deletions(-)
 rename dockerfile/{alpine/Dockerfile => alpine} (100%)
 rename dockerfile/{ubuntu/Dockerfile => ubuntu} (72%)

diff --git a/.gitea/workflows/dev_alpine.yaml b/.gitea/workflows/dev_alpine.yaml
index 268169c..9b843e4 100644
--- a/.gitea/workflows/dev_alpine.yaml
+++ b/.gitea/workflows/dev_alpine.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: hadolint/hadolint-action@v3.1.0
         with:
-          dockerfile: dockerfile/alpine/Dockerfile
+          dockerfile: dockerfile/alpine
 
   build:
     runs-on: k3s
@@ -28,4 +28,4 @@ jobs:
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
-          build_file: dockerfile/alpine/Dockerfile
+          build_file: dockerfile/alpine
diff --git a/.gitea/workflows/dev_ubuntu.yaml b/.gitea/workflows/dev_ubuntu.yaml
index 629a328..21f0d9b 100644
--- a/.gitea/workflows/dev_ubuntu.yaml
+++ b/.gitea/workflows/dev_ubuntu.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: hadolint/hadolint-action@v3.1.0
         with:
-          dockerfile: dockerfile/ubuntu/Dockerfile
+          dockerfile: dockerfile/ubuntu
 
   build:
     runs-on: k3s
@@ -28,4 +28,4 @@ jobs:
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
-          build_file: dockerfile/ubuntu/Dockerfile
+          build_file: dockerfile/ubuntu
diff --git a/.gitea/workflows/main_alpine.yaml b/.gitea/workflows/main_alpine.yaml
index bbccadd..806ce22 100644
--- a/.gitea/workflows/main_alpine.yaml
+++ b/.gitea/workflows/main_alpine.yaml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: hadolint/hadolint-action@v3.1.0
         with:
-          dockerfile: Dockerfile/alpine/
+          dockerfile: dockerfile/alpine
 
   build:
     runs-on: k3s
@@ -29,4 +29,4 @@ jobs:
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
-          build_file: dockerfile/aline/Dockerfile
+          build_file: dockerfile/alpine
diff --git a/.gitea/workflows/main_ubuntu.yaml b/.gitea/workflows/main_ubuntu.yaml
index 12a9c72..dee5009 100644
--- a/.gitea/workflows/main_ubuntu.yaml
+++ b/.gitea/workflows/main_ubuntu.yaml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: hadolint/hadolint-action@v3.1.0
         with:
-          dockerfile: Dockerfile/ubuntu/
+          dockerfile: dockerfile/ubuntu
 
   build:
     runs-on: k3s
@@ -29,4 +29,4 @@ jobs:
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
-          build_file: dockerfile/aline/Dockerfile
+          build_file: dockerfile/ubuntu
diff --git a/.hadolint.yaml b/.hadolint.yaml
index 2cecf68..30aeaba 100644
--- a/.hadolint.yaml
+++ b/.hadolint.yaml
@@ -1,3 +1,7 @@
 ignored:
   - DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 allow install latest package
-  - DL3018 # https://github.com/hadolint/hadolint/wiki/DL3018 no need to pin specific version
+  # alpine specific
+  - DL3018 # https://github.com/hadolint/hadolint/wiki/DL3018  no need to pin specific version
+  # ubuntu specific
+  - DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 no need to pin specific version
+  - DL3015 # https://github.com/hadolint/hadolint/wiki/DL3015 allow installation of recommends packages, this image is for making our live easier
diff --git a/README.md b/README.md
index cac8cef..92f3ffb 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,12 @@ This image is builded to do easier maintaince tasks. Example editing config file
 
 Installed tools:
 
-- rsync
-- mc
-- nano
+- all images (alpine and ubuntu)
+  - rsync
+  - mc
+  - nano
+- ubuntu images
+  - unp
 
 ## Ubuntu and Alpine Images
 
diff --git a/dockerfile/alpine/Dockerfile b/dockerfile/alpine
similarity index 100%
rename from dockerfile/alpine/Dockerfile
rename to dockerfile/alpine
diff --git a/dockerfile/ubuntu/Dockerfile b/dockerfile/ubuntu
similarity index 72%
rename from dockerfile/ubuntu/Dockerfile
rename to dockerfile/ubuntu
index 7ccc803..6eda82e 100644
--- a/dockerfile/ubuntu/Dockerfile
+++ b/dockerfile/ubuntu
@@ -3,7 +3,7 @@
 FROM ubuntu:22.04
 
 RUN apt-get update \
-  && apt-get install -y nano mc micro rsync ncdu git curl \
+  && apt-get install -y nano mc micro rsync ncdu git curl unp \
   && rm -rf /var/lib/apt/lists/*
 COPY ./bin/ /usr/local/bin