refactor: fix typo in install_pakage

2024-04-12 17:21:44 +03:00 · 2024-04-12 17:21:44 +03:00 · f55f03f91d
commit f55f03f91d
parent fa20517058
30 changed files with 40 additions and 40 deletions
--- a/build.py
+++ b/build.py
@ -225,7 +225,7 @@ class DockerBuilder:
        self,
        template: str,
        organization: str,
-        install_pakages=None,
+        install_packages=None,
        **kwargs,
    ) -> str:
        if self.registry:
@ -237,7 +237,7 @@ class DockerBuilder:
        rendered = Template(template).render(
            alt_image=alt_image,
            branch=self.branch,
-            install_pakages=install_pakages,
+            install_packages=install_packages,
            organization=organization,
            registry=registry,
            **kwargs,
@ -247,7 +247,7 @@ class DockerBuilder:

    @forall_images(consume_result=True)
    def render_dockerfiles(self, **kwargs):
-        def install_pakages(*names):
+        def install_packages(*names):
            tasks = self.tasks.get(self.branch, kwargs["image"])
            linux32 = '$([ "$(rpm --eval %_host_cpu)" = i586 ] && echo linux32)'
            if tasks:
@ -273,7 +273,7 @@ class DockerBuilder:
            rendered = self.render_template(
                dockerfile_template.read_text(),
                self.overwrite_organization,
-                install_pakages,
+                install_packages,
            )
            kwargs["dockerfile"].write_text(rendered + "\n")

--- a/org/alt/apache2/Dockerfile.template
+++ b/org/alt/apache2/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="http://httpd.apache.org"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("apache2") }}
+{{ install_packages("apache2") }}

 EXPOSE 80

--- a/org/alt/base/Dockerfile.template
+++ b/org/alt/base/Dockerfile.template
@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("glibc-gconv-modules", "glibc-locales", "tzdata") }}
+{{ install_packages("glibc-gconv-modules", "glibc-locales", "tzdata") }}

 CMD ["bash"]
--- a/org/alt/buildpack-deps-curl/Dockerfile.template
+++ b/org/alt/buildpack-deps-curl/Dockerfile.template
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-curl"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "ca-certificates",
    "curl",
    "gnupg",
--- a/org/alt/buildpack-deps-scm/Dockerfile.template
+++ b/org/alt/buildpack-deps-scm/Dockerfile.template
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps-scm"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "git",
    "mercurial",
    "openssh-clients",
--- a/org/alt/buildpack-deps/Dockerfile.template
+++ b/org/alt/buildpack-deps/Dockerfile.template
@ -6,7 +6,7 @@ LABEL org.opencontainers.image.title="buildpack-deps"
 LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "ImageMagick",
    "autoconf",
    "automake",
--- a/org/alt/devel/Dockerfile.template
+++ b/org/alt/devel/Dockerfile.template
@ -8,27 +8,27 @@ LABEL org.opencontainers.image.licenses="GPLv2"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

 # install editor
-{{ install_pakages("vim-console") }}
+{{ install_packages("vim-console") }}

 # install debugging tools
-{{ install_pakages("strace", "gdb") }}
+{{ install_packages("strace", "gdb") }}

 # install document viewers
-{{ install_pakages("man") }}
+{{ install_packages("man") }}

 # install version control system
-{{ install_pakages("git-core", "perl-Git") }}
+{{ install_packages("git-core", "perl-Git") }}

 # install network utils
-{{ install_pakages("iproute2", "iputils", "wget", "curl") }}
+{{ install_packages("iproute2", "iputils", "wget", "curl") }}

 # install file utils
-{{ install_pakages("lsof", "ripgrep") }}
+{{ install_packages("lsof", "ripgrep") }}

 # install shell and completions
-{{ install_pakages("zsh", "zsh-completions") }}
+{{ install_packages("zsh", "zsh-completions") }}

 # install compilation utils
-{{ install_pakages("make", "gcc", "gcc-c++") }}
+{{ install_packages("make", "gcc", "gcc-c++") }}

 CMD ["zsh"]
--- a/org/alt/distroless-builder/Dockerfile.template
+++ b/org/alt/distroless-builder/Dockerfile.template
@ -9,7 +9,7 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"

 RUN echo %_excludedocs 1 >> /etc/rpm/macros
 RUN rpm -qalds | awk '/^normal/{print $2}' | xargs rm -rf
-{{ install_pakages("python3", "glibc-utils", "apt-repo") }}
+{{ install_packages("python3", "glibc-utils", "apt-repo") }}
 WORKDIR /usr/src/distroless
 RUN mkdir file-lists
 RUN useradd -m nonroot
--- a/org/alt/etcd/Dockerfile.template
+++ b/org/alt/etcd/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("etcd") }}
+{{ install_packages("etcd") }}

 VOLUME /data

--- a/org/alt/gitea/Dockerfile.template
+++ b/org/alt/gitea/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/go-gitea/gitea"
 LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("gitea", "openssh-server", "gosu") }}
+{{ install_packages("gitea", "openssh-server", "gosu") }}

 ENV USER gitea
 ENV HOME /var/lib/gitea
--- a/org/alt/nginx/Dockerfile.template
+++ b/org/alt/nginx/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://nginx.org/"
 LABEL org.opencontainers.image.licenses="BSD"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("nginx", "apache2-html", "tzdata") }}
+{{ install_packages("nginx", "apache2-html", "tzdata") }}

 RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .

--- a/org/alt/node/Dockerfile.template
+++ b/org/alt/node/Dockerfile.template
@ -11,7 +11,7 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"
 RUN groupadd --gid 1000 node \
    && useradd --uid 1000 --gid node --shell /bin/bash --create-home node

-{{ install_pakages(
+{{ install_packages(
    "node",
    "npm",
    "yarn"
--- a/org/alt/prometheus/Dockerfile.template
+++ b/org/alt/prometheus/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/prometheus/prometheus"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("prometheus") }}
+{{ install_packages("prometheus") }}

 WORKDIR /var/lib/prometheus
 USER prometheus
--- a/org/alt/python/Dockerfile.template
+++ b/org/alt/python/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/python/cpython"
 LABEL org.opencontainers.image.licenses="Python"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "python3-module-pip",
    "python3-module-setuptools",
    "python3-dev",
--- a/org/alt/registry/Dockerfile.template
+++ b/org/alt/registry/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/docker/distribution"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("docker-registry") }}
+{{ install_packages("docker-registry") }}

 RUN ln -sf /usr/bin/docker-registry /bin/registry

--- a/org/alt/ruby/Dockerfile.template
+++ b/org/alt/ruby/Dockerfile.template
@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/ruby/ruby"
 LABEL org.opencontainers.image.licenses="BSD-2-Clause or Ruby"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("irb") }}
+{{ install_packages("irb") }}

 CMD ["irb"]
--- a/org/alt/systemd/Dockerfile.template
+++ b/org/alt/systemd/Dockerfile.template
@ -10,7 +10,7 @@ LABEL org.opencontainers.image.vendor="ALT Linux Team"

 ENV container docker

-{{ install_pakages("systemd-sysvinit") }}
+{{ install_packages("systemd-sysvinit") }}

 RUN ( \
        cd /lib/systemd/system/sysinit.target.wants/; \
--- a/org/k8s/cert-manager-cainjector/Dockerfile.template
+++ b/org/k8s/cert-manager-cainjector/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-controller/Dockerfile.template
+++ b/org/k8s/cert-manager-controller/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/cert-manager-webhook/Dockerfile.template
+++ b/org/k8s/cert-manager-webhook/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/cert-manager/cert-mana
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cert-manager") }}
+{{ install_packages("cert-manager") }}

 RUN groupadd -r -g 1000 cert-manger && useradd --no-log-init -r -u 1000 -g cert-manger cert-manger

--- a/org/k8s/coredns/Dockerfile.template
+++ b/org/k8s/coredns/Dockerfile.template
@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/coredns/coredns"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("coredns") }}
+{{ install_packages("coredns") }}

 ENTRYPOINT ["/usr/bin/coredns"]
--- a/org/k8s/etcd/Dockerfile.template
+++ b/org/k8s/etcd/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("etcd") }}
+{{ install_packages("etcd") }}

 VOLUME /data

--- a/org/k8s/flannel-cni-plugin/Dockerfile.template
+++ b/org/k8s/flannel-cni-plugin/Dockerfile.template
@ -8,6 +8,6 @@ LABEL org.opencontainers.image.source="https://github.com/flannel-io/cni-plugin"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages("cni-plugin-flannel") }}
+{{ install_packages("cni-plugin-flannel") }}

 RUN cp /usr/libexec/cni/flannel /flannel
--- a/org/k8s/flannel/Dockerfile.template
+++ b/org/k8s/flannel/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/flannel-io/flannel"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "iproute2",
    "net-tools",
    "ca-certificates",
--- a/org/k8s/kube-apiserver/Dockerfile.template
+++ b/org/k8s/kube-apiserver/Dockerfile.template
@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-master") }}
+{{ install_packages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-apiserver"]
--- a/org/k8s/kube-controller-manager/Dockerfile.template
+++ b/org/k8s/kube-controller-manager/Dockerfile.template
@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-master") }}
+{{ install_packages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-controller-manager"]
--- a/org/k8s/kube-proxy/Dockerfile.template
+++ b/org/k8s/kube-proxy/Dockerfile.template
@ -2,7 +2,7 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-node") }}
+{{ install_packages("kubernetes-node") }}

 RUN ln -s /usr/bin/kube-proxy /usr/local/bin/kube-proxy

--- a/org/k8s/kube-scheduler/Dockerfile.template
+++ b/org/k8s/kube-scheduler/Dockerfile.template
@ -2,6 +2,6 @@ FROM {{ registry }}{{ alt_image }}:{{ branch }}

 MAINTAINER alt-cloud

-{{ install_pakages("kubernetes-master") }}
+{{ install_packages("kubernetes-master") }}

 ENTRYPOINT ["/usr/bin/kube-scheduler"]
--- a/org/k8s/pause/Dockerfile.template
+++ b/org/k8s/pause/Dockerfile.template
@ -1,6 +1,6 @@
 FROM {{ registry }}{{ alt_image }}:{{ branch }} as installer

-{{ install_pakages("kubernetes-pause") }}
+{{ install_packages("kubernetes-pause") }}

 FROM scratch

--- a/org/k8s/trivy-node-collector/Dockerfile.template
+++ b/org/k8s/trivy-node-collector/Dockerfile.template
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/aquasecurity/k8s-node-
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"

-{{ install_pakages(
+{{ install_packages(
    "k8s-trivy-node-collector"
 ) }}