Skip to content

Commit f025aa6

Browse files
sineverbasineverba
authored
Merge pull request #87 from sineverba/release-1.6.0
Release 1.6.0
2 parents 17922b1 + b1d6280 commit f025aa6

File tree

8 files changed

+81
-68
lines changed

8 files changed

+81
-68
lines changed

‎.semaphore/build-deploy.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
version: v1.0
2+
3+
name: Build and deploy Pipeline
4+
agent:
5+
machine:
6+
type: e1-standard-2
7+
os_image: ubuntu2004
8+
execution_time_limit:
9+
hours: 3
10+
11+
global_job_config:
12+
secrets:
13+
- name: ACCESS_TOKENS
14+
15+
prologue:
16+
commands:
17+
- echo $DOCKER_TOKEN | docker login --username "$DOCKER_USERNAME" --password-stdin
18+
19+
env_vars:
20+
- name: DOCKER_USERNAME
21+
value: sineverba
22+
- name: DOCKER_IMAGE
23+
value: php74xc
24+
- name: BUILDX_VERSION
25+
value: 0.7.1
26+
- name: BINFMT_VERSION
27+
value: qemu-v6.2.0-25
28+
29+
blocks:
30+
- name: 'Build and deploy'
31+
task:
32+
jobs:
33+
- name: 'Build and deploy'
34+
commands:
35+
- checkout
36+
- 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
38+
- chmod a+x ~/.docker/cli-plugins/docker-buildx
39+
- docker buildx version
40+
- docker run --rm --privileged tonistiigi/binfmt:$BINFMT_VERSION --install all
41+
- docker buildx ls
42+
- docker buildx create --name multiarch --driver docker-container --use
43+
- 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 .

‎.semaphore/deploy.yml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎.semaphore/semaphore.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
version: v1.0
22

3-
name: Build and test Pipeline
3+
name: Test
44
agent:
55
machine:
66
type: e1-standard-2
7-
os_image: ubuntu1804
7+
os_image: ubuntu2004
88

99
global_job_config:
10+
secrets:
11+
- name: ACCESS_TOKENS
1012

1113
prologue:
1214
commands:
@@ -19,28 +21,26 @@ global_job_config:
1921
value: php74xc
2022

2123
blocks:
22-
- name: 'Build and test'
24+
- name: "Test"
2325
skip:
2426
when: "tag =~ '.*'"
2527
task:
2628
jobs:
27-
- name: 'Build and test'
29+
- name: "Build and test"
2830
commands:
2931
- checkout
3032
- docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE .
31-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.22
33+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.28
3234
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep OPcache
3335
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep xdebug
34-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.0.4"
36+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.1.3"
3537
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep pdo_pgsql
36-
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.22"
38+
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.25"
3739
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off"
3840
- docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M"
39-
secrets:
40-
- name: DOCKER_TOKEN
4141

4242
promotions:
4343
- name: Deploy
44-
pipeline_file: deploy.yml
44+
pipeline_file: build-deploy.yml
4545
auto_promote:
4646
when: "result = 'passed' and tag =~ '.*'"

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# 1.5.0
1+
# 1.6.0
2+
+ Refactor Semaphore
3+
+ Upgrade dependencies
4+
5+
## 1.5.0
26
+ Upgrade PHP to 7.4.22
37

48
## 1.4.0

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM php:7.4.22-cli
1+
FROM php:7.4.28-cli
22

33
# OpCache settings
44
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
55
ENV XDEBUG_MODE="debug,coverage"
66

77
# Install system dependencies
8-
RUN apt-get update && apt-get install -y \
8+
RUN apt-get update -y && apt-get install -y \
99
git \
1010
curl \
1111
libpng-dev \
@@ -20,14 +20,14 @@ RUN apt-get update && apt-get install -y \
2020
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
2121

2222
# Setup PHPXDebug
23-
RUN pecl install xdebug-3.0.4
23+
RUN pecl install xdebug-3.1.3
2424

2525
# Install PHP extensions
2626
RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd opcache zip \
2727
&& docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug
2828

2929
# Get latest Composer
30-
COPY --from=composer:1.10.22 /usr/bin/composer /usr/bin/composer
30+
COPY --from=composer:1.10.25 /usr/bin/composer /usr/bin/composer
3131

3232
# Add custom ini files
3333
COPY config/10-shorttag.ini \

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2020 sineverba
3+
Copyright (c) 2020 - 2022 sineverba
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1+
IMAGE_NAME=sineverba/testphp74xc
2+
CONTAINER_NAME=testphp74xc
3+
14
build:
2-
docker build --tag sineverba/testphp74xc .
5+
docker build --tag $(IMAGE_NAME) .
36

47
multiple:
5-
docker buildx build --tag sineverba/testphp74xc --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
8+
docker buildx build --tag $(IMAGE_NAME) --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --push .
69

710
test:
8-
@docker run --rm sineverba/testphp74xc php -v | grep 7.4.22
9-
@docker run --rm sineverba/testphp74xc php -v | grep OPcache
10-
@docker run --rm sineverba/testphp74xc php -m | grep xdebug
11-
@docker run --rm sineverba/testphp74xc php -r "xdebug_info();" | grep "3.0.4"
12-
@docker run --rm sineverba/testphp74xc php -m | grep pdo_pgsql
13-
@docker run --rm sineverba/testphp74xc php -m | grep zip
14-
@docker run --rm sineverba/testphp74xc /usr/bin/composer -V | grep "1.10.22"
15-
@docker run --rm sineverba/testphp74xc php -i | grep "short_open_tag => Off => Off"
16-
@docker run --rm sineverba/testphp74xc php -i | grep "memory_limit => 512M => 512M"
11+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep 7.4.28
12+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -v | grep OPcache
13+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep xdebug
14+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -r "xdebug_info();" | grep "3.1.3"
15+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep pdo_pgsql
16+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -m | grep zip
17+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) /usr/bin/composer -V | grep "1.10.25"
18+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "short_open_tag => Off => Off"
19+
@docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME) php -i | grep "memory_limit => 512M => 512M"
1720

1821
destroy:
19-
docker image rm sineverba/testphp74xc
22+
docker image rm $(IMAGE_NAME)

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Do you use it? **Star it!**
2121

2222
| Github / Docker Image tag | PHP Version | Composer version | XDebug | Architectures |
2323
| ------------------------- | ----------- | ---------------- | ------ | ------------- |
24-
| latest | 7.4.22 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
24+
| latest | 7.4.28 | 1.10.25 | 3.1.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
25+
| 1.6.0 | 7.4.28 | 1.10.25 | 3.1.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2526
| 1.5.0 | 7.4.22 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2627
| 1.4.0 | 7.4.20 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |
2728
| 1.3.0 | 7.4.19 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 |

0 commit comments

Comments
 (0)