From 6712aa5d01279b4e8f0c4157b295899149cb9b01 Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Thu, 13 May 2021 22:09:53 +0300 Subject: [PATCH 01/11] Switched to custom image --- Dockerfile | 65 ++++++++++++++----------------------------------- linter.template | 18 +------------- 2 files changed, 19 insertions(+), 64 deletions(-) diff --git a/Dockerfile b/Dockerfile index d01ec4c..4ea69a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM vbatts/slackware:current +FROM sevoid/slackware:current LABEL maintainer="sev@nix.org.ua" @@ -12,43 +12,16 @@ ENV PHPCS_VER=3.6.0 ENV PYLINT_VER=2.7.2 ENV ANSIBLE_LINT=4.3.7 -# pkgtools flags -ENV TERSE=0 -# upgradepkg flag -# Workaround to install new slackpkg, -# even though older version is installed -ENV INSTALL_NEW=yes - -COPY slackpkg.conf /etc/slackpkg/ -COPY linter.template /etc/slackpkg/templates/ -COPY sudoers /etc/sudoers.d/10-wheel +SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN mkdir -p /usr/local/etc -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# -# SYS: configuration and upgrades -# -RUN echo 'http://mirrors.nix.org.ua/linux/slackware/slackware64-current/' > /etc/slackpkg/mirrors -RUN touch /var/lib/slackpkg/current -RUN slackpkg update -RUN slackpkg update gpg -RUN slackpkg install glibc-2 pkgtools -RUN slackpkg install-template linter -RUN update-ca-certificates --fresh - -RUN slackpkg upgrade slackpkg -COPY slackpkg.conf /etc/slackpkg/ -RUN sed -i 's/v2.8/v15.0/g' /etc/slackpkg/slackpkg.conf -RUN echo 'https://mirrors.nix.org.ua/linux/slackware/slackware64-current/' > /etc/slackpkg/mirrors -RUN touch /var/lib/slackpkg/current -RUN rm -vf /var/lib/pkgtools/packages/slackpkg-2.8* +RUN slackpkg gpg RUN slackpkg update RUN slackpkg upgrade-all -RUN rm -rf /var/lib/slackpkg/* \ - /var/cache/packages/* -RUN touch /var/lib/slackpkg/current +RUN slackpkg install-template linter + +RUN mkdir -p /usr/local/etc COPY ./scripts/entrypoint.sh /usr/local/sbin/ COPY ./scripts/lib/lint-common.sh /usr/local/share/lint/ @@ -119,20 +92,18 @@ WORKDIR /home/linter # # Check that linters can execute # -RUN echo "=== VERSIONS ===" -RUN shellcheck --version \ - && echo -RUN yamllint --version \ - && echo -RUN hadolint --version \ - && echo -RUN php-cs-fixer --version \ - && echo -RUN phpcs --version \ - && echo -RUN pylint --version \ +RUN echo "=== VERSIONS ===" \ + && shellcheck --version \ + && echo \ + && yamllint --version \ + && echo \ + && hadolint --version \ + && echo \ + && php-cs-fixer --version \ + && echo \ + && phpcs --version \ + && echo \ + && pylint --version \ && echo -#RUN ansible-lint --version \ -# && echo ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"] diff --git a/linter.template b/linter.template index 3d21904..cad8196 100644 --- a/linter.template +++ b/linter.template @@ -1,21 +1,5 @@ +#include base.template glibc -aaa_libraries -perl -ca-certificates -dcron -sudo -acl -attr -libcap -elogind -libpwquality -e2fsprogs -cracklib -krb5 -pam -sysklogd -libnsl -libtirpc python3 python-pip python-setuptools -- 2.17.6 From a5f99dfc31bb0d415bde089493651966452c52e1 Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Thu, 13 May 2021 22:11:55 +0300 Subject: [PATCH 02/11] Updated pipeline --- .woodpecker.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 0d05b8e..309bec8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,10 +3,6 @@ clone: git: image: drone/git -workspace: - base: /drone - path: src - pipeline: env: image: alpine @@ -96,7 +92,6 @@ pipeline: repo: sevoid/linter tags: - dev - - dev-${DRONE_COMMIT:0:7} when: event: - push -- 2.17.6 From 542bc7c02095c337efd26a8168abc1e7ab8268da Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Thu, 13 May 2021 22:13:26 +0300 Subject: [PATCH 03/11] COPY linter.template --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ea69a2..cdaf3b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV ANSIBLE_LINT=4.3.7 SHELL ["/bin/bash", "-o", "pipefail", "-c"] - +COPY linter.template /etc/slackpkg/templates/ RUN slackpkg gpg RUN slackpkg update -- 2.17.6 From 2c0428282f6f00cb73d8c7abc4d0c1c8d8076965 Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Thu, 13 May 2021 22:29:16 +0300 Subject: [PATCH 04/11] Install glibc not from template --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index cdaf3b9..0ea41a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ COPY linter.template /etc/slackpkg/templates/ RUN slackpkg gpg RUN slackpkg update RUN slackpkg upgrade-all +RUN slackpkg install glibc-2 RUN slackpkg install-template linter RUN mkdir -p /usr/local/etc -- 2.17.6 From 597675e6e6548d39c12385bcf5a68d617ca8830e Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Thu, 13 May 2021 22:30:49 +0300 Subject: [PATCH 05/11] Fixed typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ea41a7..ed52113 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] COPY linter.template /etc/slackpkg/templates/ -RUN slackpkg gpg +RUN slackpkg update gpg RUN slackpkg update RUN slackpkg upgrade-all RUN slackpkg install glibc-2 -- 2.17.6 From 3a9e22cb10b4fdd8dc238ccae61c9b7822e7e16d Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Thu, 13 May 2021 22:36:37 +0300 Subject: [PATCH 06/11] BUILD: no-cache & purge --- .woodpecker.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 309bec8..b2ef6eb 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -86,6 +86,8 @@ pipeline: image: plugins/docker:linux-amd64 experimental: true squash: true + purge: true + no_cache: true secrets: - docker_username - docker_password @@ -105,6 +107,8 @@ pipeline: image: plugins/docker:linux-amd64 experimental: true squash: true + purge: true + no_cache: true secrets: - docker_username - docker_password -- 2.17.6 From 8eaee5bba7213f064b2c3428d0cf0df92cc1612d Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Fri, 14 May 2021 01:57:09 +0300 Subject: [PATCH 07/11] rm install glibc --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed52113..7f6b3bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,6 @@ COPY linter.template /etc/slackpkg/templates/ RUN slackpkg update gpg RUN slackpkg update RUN slackpkg upgrade-all -RUN slackpkg install glibc-2 RUN slackpkg install-template linter RUN mkdir -p /usr/local/etc -- 2.17.6 From 28abb2f00fcfd0d9bccd5b75908830648929f65e Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Fri, 14 May 2021 02:00:56 +0300 Subject: [PATCH 08/11] Exlude base template --- .woodpecker.yml | 5 ++++- linter.template | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b2ef6eb..dd5900a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -86,12 +86,13 @@ pipeline: image: plugins/docker:linux-amd64 experimental: true squash: true - purge: true no_cache: true secrets: - docker_username - docker_password repo: sevoid/linter + volumes: + - nix-docker-dev tags: - dev when: @@ -109,6 +110,8 @@ pipeline: squash: true purge: true no_cache: true + volumes: + - nix-docker-rel secrets: - docker_username - docker_password diff --git a/linter.template b/linter.template index cad8196..6a13ad3 100644 --- a/linter.template +++ b/linter.template @@ -1,4 +1,3 @@ -#include base.template glibc python3 python-pip -- 2.17.6 From 6cfd44a4facb7ede35a0be9538a96690473c7fd6 Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Fri, 14 May 2021 02:03:20 +0300 Subject: [PATCH 09/11] Updated path --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index dd5900a..fc52655 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -92,7 +92,7 @@ pipeline: - docker_password repo: sevoid/linter volumes: - - nix-docker-dev + - nix-docker-dev:/var/lib/docker tags: - dev when: @@ -111,7 +111,7 @@ pipeline: purge: true no_cache: true volumes: - - nix-docker-rel + - nix-docker-rel:/var/lib/docker secrets: - docker_username - docker_password -- 2.17.6 From dc265b7fc0c77444d035dde26b8ab9fb4f656e6f Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Fri, 14 May 2021 16:55:47 +0300 Subject: [PATCH 10/11] Revert "Updated path" This reverts commit 6cfd44a4facb7ede35a0be9538a96690473c7fd6. --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fc52655..dd5900a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -92,7 +92,7 @@ pipeline: - docker_password repo: sevoid/linter volumes: - - nix-docker-dev:/var/lib/docker + - nix-docker-dev tags: - dev when: @@ -111,7 +111,7 @@ pipeline: purge: true no_cache: true volumes: - - nix-docker-rel:/var/lib/docker + - nix-docker-rel secrets: - docker_username - docker_password -- 2.17.6 From 7451f3b134626a36257605b7cc405c41f173caa6 Mon Sep 17 00:00:00 2001 From: Mykyta Solomko Date: Fri, 14 May 2021 16:55:59 +0300 Subject: [PATCH 11/11] Revert "Exlude base template" This reverts commit 28abb2f00fcfd0d9bccd5b75908830648929f65e. --- .woodpecker.yml | 5 +---- linter.template | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index dd5900a..b2ef6eb 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -86,13 +86,12 @@ pipeline: image: plugins/docker:linux-amd64 experimental: true squash: true + purge: true no_cache: true secrets: - docker_username - docker_password repo: sevoid/linter - volumes: - - nix-docker-dev tags: - dev when: @@ -110,8 +109,6 @@ pipeline: squash: true purge: true no_cache: true - volumes: - - nix-docker-rel secrets: - docker_username - docker_password diff --git a/linter.template b/linter.template index 6a13ad3..cad8196 100644 --- a/linter.template +++ b/linter.template @@ -1,3 +1,4 @@ +#include base.template glibc python3 python-pip -- 2.17.6