Merge pull request #112 from sineverba/upgrade-dependencies

Upgrade dependencies

.semaphore/build-deploy.yml

@@ -23,9 +23,9 @@ global_job_config:
     - name: DOCKER_IMAGE
       value: cfhookbash
     - name: BUILDX_VERSION
-      value: 0.7.1
+      value: 0.9.1
     - name: BINFMT_VERSION
-      value: qemu-v6.2.0-25
+      value: qemu-v7.0.0-28
 
 blocks:
   - name: 'Build and deploy'

.semaphore/semaphore.yml

@@ -24,6 +24,7 @@ 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.17"
             - 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
 + Improve automations
++ Upgrade dependencies
 
 ## 4.6.0
 + Fix Cron output

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 - 2022 sineverba
+Copyright (c) 2018 - 2023 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,29 +1,35 @@
-APP_VERSION=4.6.0
-BUILDX_VERSION=0.7.1
-IMAGE_NAME=sineverba/cfhookbash-dev
-CONTAINER_NAME=cfhookbash-dev
+IMAGE_NAME=sineverba/cfhookbash
+CONTAINER_NAME=cfhookbash
+APP_VERSION=4.6.0-dev
+BUILDX_VERSION=0.9.1
+BINFMT_VERSION=qemu-v7.0.0-28
 
 
 build:
 	docker build --tag $(IMAGE_NAME):$(APP_VERSION) --file ./docker/Dockerfile .
 
-multi:
-	mkdir -vp ~/.docker/cli-plugins/
-	curl --silent -L "https://github.com/docker/buildx/releases/download/v$(BUILDX_VERSION)/buildx-v$(BUILDX_VERSION).linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+preparemulti:
+	mkdir -vp ~/.docker/cli-plugins
+	curl -L "https://github.com/docker/buildx/releases/download/v$(BUILDX_VERSION)/buildx-v$(BUILDX_VERSION).linux-amd64" > ~/.docker/cli-plugins/docker-buildx
 	chmod a+x ~/.docker/cli-plugins/docker-buildx
 	docker buildx version
-	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-	docker buildx create --name alfa && docker buildx use alfa && docker buildx inspect --bootstrap
-	docker buildx build --tag $(IMAGE_NAME):latest --tag $(IMAGE_NAME):$(APP_VERSION) --platform linux/amd64,linux/armhf,linux/arm64 --file ./docker/Dockerfile .
-	docker buildx rm alfa
-
-run:
-	docker run -it --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION)
+	docker run --rm --privileged tonistiigi/binfmt:$(BINFMT_VERSION) --install all
+	docker buildx ls
+	docker buildx rm multiarch
+	docker buildx create --name multiarch --driver docker-container --use
+
+multi:
+	docker buildx inspect --bootstrap --builder multiarch
+	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.17"
 	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"
 
+spin:
+	docker run -it --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION)
+
 inspect:
 	docker run -it --entrypoint "/bin/bash" cfhookbash
 

docker/Dockerfile

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