Merge pull request #121 from sineverba/upgrade-dependencies

Upgrade dependencies

.semaphore/build-deploy.yml

@@ -23,7 +23,7 @@ global_job_config:
     - name: DOCKER_IMAGE
       value: cfhookbash
     - name: BUILDX_VERSION
-      value: 0.12.0
+      value: 0.12.1
     - name: BINFMT_VERSION
       value: qemu-v7.0.0-28
 

.semaphore/semaphore.yml

@@ -24,8 +24,8 @@ blocks:
           commands:
             - checkout
             - docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE --file ./docker/Dockerfile .
-            - docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "Alpine Linux v3.18"
-            - docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "3.18.4"
+            - docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "Alpine Linux v3.19"
+            - docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "3.19.0"
             - docker run -it --rm --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE | grep "Using main config file /app/dehydrated/config"
             - docker run -it --rm --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE | grep "Registering account"
 

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Next version
 + Upgrade dependencies
++ Upgrade dependencies
 
 ## 4.8.0
 + Upgrade dependencies

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 - 2023 sineverba
+Copyright (c) 2018 - 2024 sineverba
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,7 +1,7 @@
 IMAGE_NAME=sineverba/cfhookbash
 CONTAINER_NAME=cfhookbash
 APP_VERSION=4.8.0-dev
-BUILDX_VERSION=0.12.0
+BUILDX_VERSION=0.12.1
 BINFMT_VERSION=qemu-v7.0.0-28
 
 
@@ -23,8 +23,8 @@ multi:
 	docker buildx build --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $(IMAGE_NAME):$(APP_VERSION) --tag $(IMAGE_NAME):latest --file ./docker/Dockerfile .
 
 test:
-	docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "Alpine Linux v3.18"
-	docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "3.18.4"
+	docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "Alpine Linux v3.19"
+	docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "3.19.0"
 	docker run -it --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) | grep "INFO: Using main config file /app/dehydrated/config"
 	docker run -it --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) | grep "Registering account"
 	docker run -it --rm --entrypoint dehydrated/dehydrated --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) --version | grep "Dehydrated version: 0.7.2"
@@ -36,5 +36,5 @@ inspect:
 	docker run -it --entrypoint "/bin/bash" --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION)
 
 destroy:
-	docker image rm alpine:3.18.4
+	docker image rm alpine:3.19.0
 	docker image rm $(IMAGE_NAME):$(APP_VERSION)

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.4
+FROM alpine:3.19.0
 
 RUN apk update && apk upgrade && apk add --no-cache bash curl jq openssl --upgrade grep
 

docker/dehydrated/dehydrated

@@ -1011,7 +1011,7 @@ signed_request() {
 extract_altnames() {
   csr="${1}" # the CSR itself (not a file)
 
-  if ! <<<"${csr}" "${OPENSSL}" req -verify -noout 2>/dev/null; then
+  if ! <<<"${csr}" "${OPENSSL}" req -verify -noout >/dev/null 2>&1; then
     _exiterr "Certificate signing request isn't valid"
   fi