Skip to content

Commit e076af6

Browse files
authored
Merge pull request #95 from sineverba/upgrade-dependencies
Upgrade dependencies
2 parents a0f5204 + 969de5e commit e076af6

File tree

4 files changed

+32
-8
lines changed

4 files changed

+32
-8
lines changed

.dockerignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ storage/framework/cache/*
1010
storage/framework/sessions/*
1111
storage/framework/views/*
1212
storage/logs/*
13-
vendor
13+
vendor
14+
*.md
15+
LICENSE
16+
Makefile

.semaphore/build-deploy.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ global_job_config:
2222
- name: DOCKER_IMAGE
2323
value: php74xc
2424
- name: BUILDX_VERSION
25-
value: 0.10.0
25+
value: 0.11.1
2626
- name: BINFMT_VERSION
2727
value: qemu-v7.0.0-28
2828

@@ -34,11 +34,22 @@ blocks:
3434
commands:
3535
- checkout
3636
- mkdir -vp ~/.docker/cli-plugins/
37-
- curl --silent -L "https://github.com/docker/buildx/releases/download/v$BUILDX_VERSION/buildx-v$BUILDX_VERSION.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
37+
- >-
38+
curl
39+
--silent
40+
-L
41+
"https://github.com/docker/buildx/releases/download/v$BUILDX_VERSION/buildx-v$BUILDX_VERSION.linux-amd64"
42+
>
43+
~/.docker/cli-plugins/docker-buildx
3844
- chmod a+x ~/.docker/cli-plugins/docker-buildx
3945
- docker buildx version
4046
- docker run --rm --privileged tonistiigi/binfmt:$BINFMT_VERSION --install all
4147
- docker buildx ls
4248
- docker buildx create --name multiarch --driver docker-container --use
4349
- docker buildx inspect --bootstrap --builder multiarch
44-
- 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 .
50+
- >-
51+
docker buildx build
52+
--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7
53+
--tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME
54+
--tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest
55+
--push "."

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# 1.8.0
1+
# Next version
2+
+ Upgrade dependencies
3+
4+
## 1.8.0
25
+ Upgrade dependencies
36

47
## 1.7.0

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
IMAGE_NAME=sineverba/php74xc
22
CONTAINER_NAME=php74xc
33
APP_VERSION=1.8.0-dev
4-
BUILDX_VERSION=0.10.0
4+
BUILDX_VERSION=0.11.1
55
BINFMT_VERSION=qemu-v7.0.0-28
66

77
build:
88
docker build --tag $(IMAGE_NAME):$(APP_VERSION) .
99

1010
preparemulti:
1111
mkdir -vp ~/.docker/cli-plugins
12-
curl -L "https://github.com/docker/buildx/releases/download/v$(BUILDX_VERSION)/buildx-v$(BUILDX_VERSION).linux-amd64" > ~/.docker/cli-plugins/docker-buildx
12+
curl \
13+
-L \
14+
"https://github.com/docker/buildx/releases/download/v$(BUILDX_VERSION)/buildx-v$(BUILDX_VERSION).linux-amd64" \
15+
> \
16+
~/.docker/cli-plugins/docker-buildx
1317
chmod a+x ~/.docker/cli-plugins/docker-buildx
1418
docker buildx version
1519
docker run --rm --privileged tonistiigi/binfmt:$(BINFMT_VERSION) --install all
@@ -19,7 +23,9 @@ preparemulti:
1923

2024
multi:
2125
docker buildx inspect --bootstrap --builder multiarch
22-
docker buildx build --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $(IMAGE_NAME):$(APP_VERSION) --tag $(IMAGE_NAME):latest .
26+
docker buildx build \
27+
--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 \
28+
--tag $(IMAGE_NAME):$(APP_VERSION) "."
2329

2430
test:
2531
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -v | grep 7.4.33
@@ -34,4 +40,5 @@ test:
3440
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -i | grep "memory_limit => 512M => 512M"
3541

3642
destroy:
43+
docker image rm php:7.4.33-cli
3744
docker image rm $(IMAGE_NAME):$(APP_VERSION)

0 commit comments

Comments
 (0)