From 2668576158e1f073179dd8919eac30a4019d7c85 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 12:29:37 +0100 Subject: [PATCH 1/5] feature/sleep-for-ever --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7d31d4c..ee67f76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,3 +5,5 @@ RUN apk update && \ apk add --no-cache nano mc micro rsync ncdu git curl COPY ./bin/ /usr/local/bin + +ENTRYPOINT ["sleep", "infinity"] -- 2.45.2 From 8fc324aa13648eb8704a3c8b70e82f6e6577d998 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 12:35:08 +0100 Subject: [PATCH 2/5] added ssh client install --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee67f76..8d6e9d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,7 @@ FROM alpine:3.18 RUN apk update && \ - apk add --no-cache nano mc micro rsync ncdu git curl - + apk add --no-cache nano mc micro rsync ncdu git curl openssh-client-common COPY ./bin/ /usr/local/bin ENTRYPOINT ["sleep", "infinity"] -- 2.45.2 From 5f872ade7bdf450f31e2237dff1a04565de17ba4 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 12:35:18 +0100 Subject: [PATCH 3/5] prettier working --- .editorconfig | 4 ++-- .vscode/extensions.json | 9 +++++++++ .vscode/settings.json | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json diff --git a/.editorconfig b/.editorconfig index ebe51d3..5d47c21 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,5 +8,5 @@ indent_style = space indent_size = 2 end_of_line = lf charset = utf-8 -trim_trailing_whitespace = false -insert_final_newline = false \ No newline at end of file +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..76acc51 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,9 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "EditorConfig.EditorConfig", + // Code formatter using prettier + "esbenp.prettier-vscode" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..36be7a5 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "editor.formatOnPaste": false +} -- 2.45.2 From abb31b634e62beeef7fb9cc31f280e2454b9f5b4 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 12:35:21 +0100 Subject: [PATCH 4/5] faster MR --- .gitea/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 8136603..476e6c9 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -16,7 +16,7 @@ jobs: build: runs-on: k3s - needs: Dockerfile lint + # needs: Dockerfile lint # lets process faster pull-requests steps: - uses: actions/checkout@v3 - name: Kaniko build -- 2.45.2 From 506bb375891468d9d31e0ddcfe0335900ff08c51 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 12 Nov 2023 12:39:04 +0100 Subject: [PATCH 5/5] fix ssh client installation --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d6e9d1..28eba9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ # https://hub.docker.com/_/alpine +# https://endoflife.date/alpine FROM alpine:3.18 RUN apk update && \ - apk add --no-cache nano mc micro rsync ncdu git curl openssh-client-common + apk add --no-cache nano mc micro rsync ncdu git curl openssh-client COPY ./bin/ /usr/local/bin ENTRYPOINT ["sleep", "infinity"] -- 2.45.2