From 6f838d6a74854e7f912f953d220e89bfdb7d84c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20P=C3=A9rez?= <jpl@jesusperez.pro>
Date: Thu, 3 Oct 2024 03:31:17 +0100
Subject: [PATCH] chore: update to 2.8.1 with bookworm and rust
---
CHANGELOG.md | 8 ++++++++
repo-config.yaml | 2 +-
src/Dockerfile | 23 ++++++++++++++---------
src/create.sh | 2 +-
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad38d82..b66b743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,3 +39,11 @@ Move to alpine 3.15
Add YQ Kubectl Restic
---
+
+date: 3 October 2024
+
+2.8.1
+Move to bookworm with Rust
+Add YQ Kubectl Restic Nushell Rust env
+
+---
diff --git a/repo-config.yaml b/repo-config.yaml
index 09c406c..533c178 100644
--- a/repo-config.yaml
+++ b/repo-config.yaml
@@ -7,7 +7,7 @@ Repo: https://github.com/almir/docker-webhook.git
Source: docker-webhook
Name: webhook-pipeline
-Version: 2.8.0
+Version: 2.8.1
# To get latest_image
IMAGE_NAME: almir/webhook
diff --git a/src/Dockerfile b/src/Dockerfile
index 6876f1c..46ec4f5 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -1,10 +1,10 @@
# Dockerfile for https://github.com/adnanh/webhook
-FROM docker.io/golang:alpine3.15 AS build
+FROM docker.io/golang:1-bookworm AS build
#MAINTAINER Almir Dzinovic <almir@dzinovic.net>
WORKDIR /go/src/github.com/adnanh/webhook
-ENV WEBHOOK_VERSION 2.8.0
+ENV WEBHOOK_VERSION 2.8.1
RUN apk add --update -t build-deps curl libc-dev gcc libgcc
RUN curl -L --silent -o webhook.tar.gz https://github.com/adnanh/webhook/archive/${WEBHOOK_VERSION}.tar.gz && \
tar -xzf webhook.tar.gz --strip 1 && \
@@ -14,27 +14,32 @@ RUN curl -L --silent -o webhook.tar.gz https://github.com/adnanh/webhook
rm -rf /var/cache/apk/* && \
rm -rf /go
-FROM docker.io/alpine:3.15
+#FROM docker.io/alpine:edge
+FROM docker.io/rust::bookworm
-ENV RESTIC_VERSION=0.12.1
+ENV RESTIC_VERSION=0.17.1
ENV RESTIC_ARCH=linux_amd64
-ENV K8S_VERSION=1.23.1
+ENV K8S_VERSION=1.31.1
ENV K8S_ARCH=linux-amd64
-ENV JQ_VERSION=1.6
+ENV JQ_VERSION=1.7,1
ENV JQ_ARCH=linux64
-ENV YQ_VERSION=4.16.2
+ENV YQ_VERSION=4.44.3
ENV YQ_ARCH=linux_amd64
-RUN apk add --update \
+#RUN apk add --update \
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends \
ca-certificates \
bash \
vim \
git \
- bzip2 \
+ bzip2 \
sed \
+ nushell \
openssh \
openssl \
libressl \
diff --git a/src/create.sh b/src/create.sh
index fafec91..fd064fb 100755
--- a/src/create.sh
+++ b/src/create.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-podman build -t webhook:2.8.0 .
+podman build -t webhook:2.8.1 .