Skip to content

Commit 1dad821

Browse files
authored
Merge pull request #118 from sineverba/release-4.8.0
Release 4.8.0
2 parents 47910b3 + 913be5e commit 1dad821

6 files changed

Lines changed: 28 additions & 9 deletions

File tree

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.semaphore/
2+
*.md
3+
LICENSE

.semaphore/build-deploy.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ global_job_config:
2323
- name: DOCKER_IMAGE
2424
value: cfhookbash
2525
- name: BUILDX_VERSION
26-
value: 0.9.1
26+
value: 0.11.0
2727
- name: BINFMT_VERSION
2828
value: qemu-v7.0.0-28
2929

@@ -35,11 +35,21 @@ blocks:
3535
commands:
3636
- checkout
3737
- mkdir -vp ~/.docker/cli-plugins/
38-
- curl --silent -L "https://github.com/docker/buildx/releases/download/v$BUILDX_VERSION/buildx-v$BUILDX_VERSION.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
38+
- >-
39+
curl
40+
--silent
41+
-L "https://github.com/docker/buildx/releases/download/v$BUILDX_VERSION/buildx-v$BUILDX_VERSION.linux-amd64"
42+
> ~/.docker/cli-plugins/docker-buildx
3943
- chmod a+x ~/.docker/cli-plugins/docker-buildx
4044
- docker buildx version
4145
- docker run --rm --privileged tonistiigi/binfmt:$BINFMT_VERSION --install all
4246
- docker buildx ls
4347
- docker buildx create --name multiarch --driver docker-container --use
4448
- docker buildx inspect --bootstrap --builder multiarch
45-
- 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 .
49+
- >-
50+
docker buildx build
51+
--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7
52+
--tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME
53+
--tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest
54+
--push
55+
--file ./docker/Dockerfile "."

.semaphore/semaphore.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ blocks:
2424
commands:
2525
- checkout
2626
- docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE --file ./docker/Dockerfile .
27-
- docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "Alpine Linux v3.17"
27+
- docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "Alpine Linux v3.18"
28+
- docker run -it --rm --entrypoint cat --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE /etc/os-release | grep "3.18.2"
2829
- docker run -it --rm --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE | grep "Using main config file /app/dehydrated/config"
2930
- docker run -it --rm --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE | grep "Registering account"
3031

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# 4.7.1
1+
# 4.8.0
2+
+ Upgrade dependencies
3+
4+
## 4.7.1
25
+ Fix deploy
36

47
## 4.7.0

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IMAGE_NAME=sineverba/cfhookbash
22
CONTAINER_NAME=cfhookbash
3-
APP_VERSION=4.7.0-dev
4-
BUILDX_VERSION=0.9.1
3+
APP_VERSION=4.8.0-dev
4+
BUILDX_VERSION=0.11.0
55
BINFMT_VERSION=qemu-v7.0.0-28
66

77

@@ -23,7 +23,8 @@ multi:
2323
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 .
2424

2525
test:
26-
docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "Alpine Linux v3.17"
26+
docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "Alpine Linux v3.18"
27+
docker run --rm -it --entrypoint cat --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) /etc/os-release | grep "3.18.2"
2728
docker run -it --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) | grep "INFO: Using main config file /app/dehydrated/config"
2829
docker run -it --rm --name $(CONTAINER_NAME) $(IMAGE_NAME):$(APP_VERSION) | grep "Registering account"
2930

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

3637
destroy:
38+
docker image rm alpine:3.18.2
3739
docker image rm $(IMAGE_NAME):$(APP_VERSION)

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.17.0
1+
FROM alpine:3.18.2
22

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

0 commit comments

Comments
 (0)