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