From ef2fd4978de519eb584f14cf1e8c7faa87b640b9 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 17:32:25 +0100 Subject: [PATCH 1/4] fixed paths and added unp --- .gitea/workflows/dev_alpine.yaml | 4 ++-- .gitea/workflows/dev_ubuntu.yaml | 4 ++-- .gitea/workflows/main_alpine.yaml | 4 ++-- .gitea/workflows/main_ubuntu.yaml | 4 ++-- README.md | 1 + dockerfile/{alpine/Dockerfile => alpine} | 2 +- dockerfile/{ubuntu/Dockerfile => ubuntu} | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) rename dockerfile/{alpine/Dockerfile => alpine} (95%) 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/README.md b/README.md index cac8cef..2a3f92b 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Installed tools: - rsync - mc - nano +- unp ## Ubuntu and Alpine Images diff --git a/dockerfile/alpine/Dockerfile b/dockerfile/alpine similarity index 95% rename from dockerfile/alpine/Dockerfile rename to dockerfile/alpine index 28eba9b..f4c4d57 100644 --- a/dockerfile/alpine/Dockerfile +++ b/dockerfile/alpine @@ -3,7 +3,7 @@ FROM alpine:3.18 RUN apk update && \ - apk add --no-cache nano mc micro rsync ncdu git curl openssh-client + apk add --no-cache nano mc micro rsync ncdu git curl openssh-client unp COPY ./bin/ /usr/local/bin ENTRYPOINT ["sleep", "infinity"] 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 -- 2.45.2 From b05d480a35a46b50c9e5d68f22bc4b5c7787514d Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 17:34:41 +0100 Subject: [PATCH 2/4] .hadolint.yaml rule updated --- .hadolint.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.hadolint.yaml b/.hadolint.yaml index 2cecf68..d12e316 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1,3 +1,4 @@ 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 + - DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 ubuntu: no need to pin specific version + - DL3018 # https://github.com/hadolint/hadolint/wiki/DL3018 alpine: no need to pin specific version -- 2.45.2 From df35eb744391b23519e9b4832f122b247685ebcf Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 17:40:27 +0100 Subject: [PATCH 3/4] update rule --- .hadolint.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.hadolint.yaml b/.hadolint.yaml index d12e316..30aeaba 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1,4 +1,7 @@ ignored: - DL3013 # https://github.com/hadolint/hadolint/wiki/DL3013 allow install latest package - - DL3008 # https://github.com/hadolint/hadolint/wiki/DL3008 ubuntu: no need to pin specific version - - DL3018 # https://github.com/hadolint/hadolint/wiki/DL3018 alpine: 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 -- 2.45.2 From 17fbe6fb9c43159571c907405af1a8d465a86182 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 17:42:37 +0100 Subject: [PATCH 4/4] removed unp from alpine; because it doesn't exist --- README.md | 10 ++++++---- dockerfile/alpine | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2a3f92b..92f3ffb 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,12 @@ This image is builded to do easier maintaince tasks. Example editing config file Installed tools: -- rsync -- mc -- nano -- unp +- all images (alpine and ubuntu) + - rsync + - mc + - nano +- ubuntu images + - unp ## Ubuntu and Alpine Images diff --git a/dockerfile/alpine b/dockerfile/alpine index f4c4d57..28eba9b 100644 --- a/dockerfile/alpine +++ b/dockerfile/alpine @@ -3,7 +3,7 @@ FROM alpine:3.18 RUN apk update && \ - apk add --no-cache nano mc micro rsync ncdu git curl openssh-client unp + apk add --no-cache nano mc micro rsync ncdu git curl openssh-client COPY ./bin/ /usr/local/bin ENTRYPOINT ["sleep", "infinity"] -- 2.45.2