Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades all around #99

Merged
merged 2 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ RUN --mount=type=bind,src=formulae,target=/tmp/formulae \
# install from custom formulae
#
&& python /tmp/src/main.py /tmp/formulae/argocd.py \
&& python /tmp/src/main.py /tmp/formulae/buf.py \
&& python /tmp/src/main.py /tmp/formulae/buildkit.py \
&& python /tmp/src/main.py /tmp/formulae/cni.py \
&& python /tmp/src/main.py /tmp/formulae/cri-dockerd.py \
Expand Down Expand Up @@ -84,9 +85,9 @@ COPY --from=docker/buildx-bin:latest /buildx /usr/libexec/docker/cli-plugins/doc
#
ARG ACTIONS_CACHE_URL
RUN --mount=type=secret,id=ACTIONS_RUNTIME_TOKEN : \
&& rustup toolchain install 1.77.0 \
&& rustup toolchain install 1.78.0 \
&& rustup toolchain install nightly --component rustfmt \
&& rustup default 1.77.0 \
&& rustup default 1.78.0 \
#&& ( \
# SCCACHE_GHA_ENABLED=true \
# ACTIONS_CACHE_URL=$ACTIONS_CACHE_URL \
Expand All @@ -95,36 +96,25 @@ RUN --mount=type=secret,id=ACTIONS_RUNTIME_TOKEN : \
#) \
&& sccache --start-server \
&& export RUSTC_WRAPPER=sccache CARGO_INCREMENTAL=0 \
&& cargo install cargo-deny --version 0.14.20 \
&& cargo install cargo-semver-checks --version 0.26.0 \
&& cargo install sqlx-cli --version 0.7.3 \
&& cargo install cargo-llvm-cov --version 0.5.39 \
&& cargo install cargo-hack --version 0.6.15 \
&& cargo install buffrs --version 0.8.0 \
&& cargo install cargo-deny --version 0.14.24 \
&& cargo install cargo-semver-checks --version 0.31.0 \
&& cargo install sqlx-cli --version 0.7.4 \
&& cargo install cargo-llvm-cov --version 0.6.10 \
&& cargo install cargo-hack --version 0.6.28 \
&& cargo install buffrs --version 0.8.1 \
&& sccache --stop-server

#
# Buf
#
RUN : \
&& BIN="/usr/bin" \
&& VERSION="1.17.0" \
&& curl -sSL \
"https://github.com/bufbuild/buf/releases/download/v${VERSION}/buf-$(uname -s)-$(uname -m)" \
-o "${BIN}/buf" && \
chmod +x "${BIN}/buf"

#
# Python tools
#
RUN : \
&& python -m pip install pipx==1.3.3 -v \
&& python -m pip install pipx==1.6.0 -v \
&& pipx install poetry==1.8.3 \
&& pipx install pdm==2.12.1 \
&& pipx install slap-cli==1.12.0 \
&& pipx install kraken-wrapper==0.34.1 \
&& pipx install uv==0.1.1 \
&& pipx install ansible-base==2.10.17 && pipx inject ansible-base ansible==9.2.0 \
&& pipx install pdm==2.15.4 \
&& pipx install slap-cli==1.14.1 \
&& pipx install kraken-wrapper==0.36.8 \
&& pipx install uv==0.2.10 \
&& pipx install ansible==9.6.1 --include-deps \
&& rm -rf ~/.cache/pip

#
Expand Down
53 changes: 26 additions & 27 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion formulae/argocd.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class ArgocdFormula(DownloadFileFormula):

platform = sys.platform
version = "v2.10.2"
version = "v2.11.3"
download_url = "https://github.com/argoproj/argo-cd/releases/download/${version}/argocd-linux-${archv2}"
chmod = 0o775
output_directory = "${install_to}"
Expand Down
13 changes: 13 additions & 0 deletions formulae/buf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import sys

from formula import DownloadFileFormula


class BufFormula(DownloadFileFormula):

platform = sys.platform.capitalize()
version = "1.32.2"
download_url = "https://github.com/bufbuild/buf/releases/download/v${version}/buf-${platform}-${archv1}"
chmod = 0o775
output_directory = "${install_to}"
install_to = "/usr/local/bin"
2 changes: 1 addition & 1 deletion formulae/buildkit.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class BuildkitFormula(BinaryInstallFormula):

version = "0.12.4"
version = "0.13.2"
archive_url = "https://github.com/moby/buildkit/releases/download/v${version}/buildkit-v${version}.linux-${archv2}.tar.gz"
archive_members = ["bin/*"]
install_to = "/usr/local/bin"
2 changes: 1 addition & 1 deletion formulae/cni.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class CniFormula(BinaryInstallFormula):

version = "v1.4.0"
version = "v1.5.0"
archive_url = "https://github.com/containernetworking/plugins/releases/download/${version}/cni-plugins-linux-${archv2}-${version}.tgz"
archive_members = ["*"]
install_to = "/opt/cni/bin"
Expand Down
2 changes: 1 addition & 1 deletion formulae/cri-dockerd.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class CriDockerdFormula(BinaryInstallFormula):

version = "0.3.10"
version = "0.3.14"
archive_url = "https://github.com/Mirantis/cri-dockerd/releases/download/v${version}/cri-dockerd-${version}.amd64.tgz"
archive_members = ["cri-dockerd/cri-dockerd"]
install_to = "/usr/local/bin"
2 changes: 1 addition & 1 deletion formulae/crictl.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class CrictlFormula(BinaryInstallFormula):

version = "v1.29.0"
version = "v1.30.0"
archive_url = "https://github.com/kubernetes-sigs/cri-tools/releases/download/${version}/crictl-${version}-linux-amd64.tar.gz"
archive_members = ["crictl"]
install_to = "/usr/local/bin"
2 changes: 1 addition & 1 deletion formulae/kubectl.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class KubectlFormula(DownloadFileFormula):

platform = sys.platform
version = "v1.28.4"
version = "v1.30.1"
download_url = "https://dl.k8s.io/release/${version}/bin/${platform}/${archv2}/kubectl"
chmod = 0o775
output_directory = "${install_to}"
Expand Down
2 changes: 1 addition & 1 deletion formulae/manifest-tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ManifestToolFormula(BinaryInstallFormula):

version = "2.1.5"
version = "2.1.6"
archive_url = (
"https://github.com/estesp/manifest-tool/releases/download/v${version}/"
"binaries-manifest-tool-${version}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion formulae/minikube.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class MinikubeFormula(DownloadFileFormula):

platform = sys.platform
version = "v1.32.0"
version = "v1.33.1"
download_url = "https://storage.googleapis.com/minikube/releases/${version}/minikube-linux-${archv2}"
chmod = 0o775
output_directory = "${install_to}"
Expand Down
2 changes: 1 addition & 1 deletion formulae/sccache.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class SccacheFormula(BinaryInstallFormula):

platform = {"linux": "unknown-linux-musl", "darwin": "apple-darwin"}[sys.platform]
version = "0.7.4"
version = "0.8.1"
archive_url = "https://github.com/mozilla/sccache/releases/download/v${version}/sccache-v${version}-${archv1}-${platform}.tar.gz"
archive_members = ["sccache-v${version}-${archv1}-${platform}/sccache"]
install_to = "/usr/local/bin"
Expand Down
2 changes: 1 addition & 1 deletion formulae/stern.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class SternFormula(BinaryInstallFormula):

version = "1.28.0"
version = "1.30.0"
archive_url = "https://github.com/stern/stern/releases/download/v${version}/stern_${version}_linux_${archv2}.tar.gz"
archive_members = ["stern"]
install_to = "/usr/local/bin"
2 changes: 1 addition & 1 deletion formulae/terraform.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class TerraformFormula(BinaryInstallFormula):

platform = {"linux": "unknown-linux-musl", "darwin": "apple-darwin"}[sys.platform]
version = "1.6.6"
version = "1.8.5"
archive_url = "https://releases.hashicorp.com/terraform/${version}/terraform_${version}_linux_${archv2}.zip"
archive_members = ["terraform"]
install_to = "/usr/local/bin"
Expand Down
2 changes: 1 addition & 1 deletion formulae/yq.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class YqFormula(DownloadFileFormula):

platform = sys.platform
version = "4.40.5"
version = "4.44.1"
download_url = "https://github.com/mikefarah/yq/releases/download/v${version}/yq_${platform}_${archv2}"
chmod = 0o775
output_file = "${install_to}/yq"
Expand Down
Loading