fixed paths and added unp (#8)

Reviewed-on: #8

.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

.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

.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

.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

.hadolint.yaml

@@ -1,3 +1,7 @@
 ignored:
   - DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 allow install latest package
+  # 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

README.md

@@ -4,9 +4,12 @@ This image is builded to do easier maintaince tasks. Example editing config file
 
 Installed tools:
 
-- rsync
+- all images (alpine and ubuntu)
-- mc
+  - rsync
-- nano
+  - mc
+  - nano
+- ubuntu images
+  - unp
 
 ## Ubuntu and Alpine Images
 

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