Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #18

Merged
merged 1 commit into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:

build:
docker:
- image: cimg/base:2023.01
- image: cimg/base:2023.07
environment:
DOCKER_USERNAME: sineverba
DOCKER_IMAGE: php56x
Expand Down
7 changes: 6 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@ storage/framework/cache/*
storage/framework/sessions/*
storage/framework/views/*
storage/logs/*
vendor
vendor
.circleci/
.semaphore/
*.md
LICENSE
Makefile
15 changes: 12 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: php56xc
- name: BUILDX_VERSION
value: 0.9.1
value: 0.11.1
- name: BINFMT_VERSION
value: qemu-v7.0.0-28

Expand All @@ -35,11 +35,20 @@ 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 .
- >-
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 "."
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# 1.5.0
# Next version
+ Upgrade dependencies

## 1.5.0
+ Refactor Semaphore
+ Upgrade dependencies

Expand Down
18 changes: 15 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ FROM php:5.6.40-cli

# OpCache settings
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"

# Update the repository, archived
RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list
# Install system dependencies
RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \
RUN apt-get update --allow-unauthenticated -y \
&& apt-get upgrade --allow-unauthenticated -y \
&& apt-get install --allow-unauthenticated -y \
apt-utils \
git \
curl \
libpng-dev \
Expand All @@ -16,7 +20,15 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \
libpq-dev

# Setup PHPXDebug
RUN pecl install xdebug-2.5.5
RUN cd /tmp && \
git clone https://github.com/xdebug/xdebug.git && \
cd xdebug && \
git checkout XDEBUG_2_5_5 && \
phpize && \
./configure --enable-xdebug && \
make && \
make install && \
rm -rf /tmp/xdebug
RUN docker-php-ext-enable xdebug

# Clear cache
Expand Down
17 changes: 12 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
IMAGE_NAME=sineverba/php56xc
CONTAINER_NAME=php56xc
APP_VERSION=1.5.0-dev
BUILDX_VERSION=0.9.1
BUILDX_VERSION=0.11.1
BINFMT_VERSION=qemu-v7.0.0-28

build:
docker build --tag $(IMAGE_NAME):$(APP_VERSION) .
docker build --tag $(IMAGE_NAME):$(APP_VERSION) "."

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
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 tonistiigi/binfmt:$(BINFMT_VERSION) --install all
Expand All @@ -19,7 +23,9 @@ preparemulti:

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 .
docker buildx build \
--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 \
--tag $(IMAGE_NAME):$(APP_VERSION) "."

test:
docker run --rm $(IMAGE_NAME):$(APP_VERSION) php -v | grep 5.6.40
Expand All @@ -33,4 +39,5 @@ test:
docker run --rm $(IMAGE_NAME):$(APP_VERSION) php -i | grep "memory_limit => 512M => 512M"

destroy:
docker image rm $(IMAGE_NAME):$(APP_VERSION) $(IMAGE_NAME):latest
docker image rm $(IMAGE_NAME):$(APP_VERSION)
docker image rm php:5.6.40-cli