Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Alessandro Arici committed Jul 5, 2023
1 parent 75ce9ef commit 4b81ab2
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.semaphore/
*.md
LICENSE
16 changes: 13 additions & 3 deletions .semaphore/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ global_job_config:
- name: DOCKER_IMAGE
value: cfhookbash
- name: BUILDX_VERSION
value: 0.9.1
value: 0.11.0
- name: BINFMT_VERSION
value: qemu-v7.0.0-28

Expand All @@ -35,11 +35,21 @@ blocks:
commands:
- checkout
- 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
- >-
curl
--silent
-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 tonistiigi/binfmt:$BINFMT_VERSION --install all
- docker buildx ls
- docker buildx create --name multiarch --driver docker-container --use
- docker buildx inspect --bootstrap --builder multiarch
- docker buildx build --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --push --file ./docker/Dockerfile .
- >-
docker buildx build
--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7
--tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME
--tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest
--push
--file ./docker/Dockerfile "."
3 changes: 2 additions & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +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.17"
- 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.2"
- 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"

Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# 4.7.1
# Next version
+ Upgrade dependencies

## 4.7.1
+ Fix deploy

## 4.7.0
Expand Down
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
IMAGE_NAME=sineverba/cfhookbash
CONTAINER_NAME=cfhookbash
APP_VERSION=4.7.0-dev
BUILDX_VERSION=0.9.1
APP_VERSION=4.7.1-dev
BUILDX_VERSION=0.11.0
BINFMT_VERSION=qemu-v7.0.0-28


Expand All @@ -23,7 +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.17"
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.2"
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"

Expand All @@ -34,4 +35,5 @@ inspect:
docker run -it --entrypoint "/bin/bash" cfhookbash

destroy:
docker image rm alpine:3.18.2
docker image rm $(IMAGE_NAME):$(APP_VERSION)
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.0
FROM alpine:3.18.2

RUN apk update && apk upgrade && apk add --no-cache bash curl jq openssl --upgrade grep

Expand Down

0 comments on commit 4b81ab2

Please sign in to comment.