From 92fb8110ea823b2d2e6d71133cef41523de74a70 Mon Sep 17 00:00:00 2001 From: Alessandro Arici Date: Sun, 7 Apr 2024 22:56:00 +0200 Subject: [PATCH 1/3] Upgrade dependencies --- .circleci/config.yml | 167 ++++++++++++++++++++++++++++++++++++ .semaphore/build-deploy.yml | 55 ------------ .semaphore/semaphore.yml | 16 +++- CHANGELOG.md | 5 +- Dockerfile | 9 +- LICENSE | 2 +- Makefile | 19 +++- README.md | 26 +++--- 8 files changed, 220 insertions(+), 79 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .semaphore/build-deploy.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..5e54df0 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,167 @@ +version: 2.1 +executors: + arm64_executor: + machine: + image: ubuntu-2204:current + resource_class: arm.large + environment: + DOCKER_IMAGE: php74xc + BINFMT_VERSION: qemu-v7.0.0-28 + COMPOSER_VERSION: 1.10.27 + XDEBUG_VERSION: 3.1.6 + MCRYPT_VERSION: 1.0.7 + amd64_executor: + machine: + image: ubuntu-2204:current + resource_class: large + environment: + DOCKER_IMAGE: php74xc + BINFMT_VERSION: qemu-v7.0.0-28 + COMPOSER_VERSION: 1.10.27 + XDEBUG_VERSION: 3.1.6 + MCRYPT_VERSION: 1.0.7 + DELETE_TAG_TAG: 1.0.2 +jobs: + test: + executor: amd64_executor + steps: + - checkout + - run: + name: "Build image" + command: | + docker build \ + --build-arg COMPOSER_VERSION=$COMPOSER_VERSION \ + --build-arg XDEBUG_VERSION=$XDEBUG_VERSION \ + --build-arg MCRYPT_VERSION=$MCRYPT_VERSION \ + --tag $DOCKER_LOGIN/$DOCKER_IMAGE:test \ + '.' + - run: + name: "Test image" + command: | + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -v | grep 7.4.33 + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -v | grep OPcache + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -m | grep xdebug + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -r "xdebug_info();" | grep $XDEBUG_VERSION + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -m | grep pdo_pgsql + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test /usr/bin/composer -V | grep "1.10.27" + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -i | grep "short_open_tag => Off => Off" + docker run --rm $DOCKER_LOGIN/$DOCKER_IMAGE:test php -i | grep "memory_limit => 512M => 512M" + build_arm64: + executor: arm64_executor + steps: + - checkout + - run: + name: "Login to Docker HUB" + command: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD + - run: + name: "Install tonistiigi/binfmt" + command: docker run --rm --privileged tonistiigi/binfmt:$BINFMT_VERSION --install all + - run: + name: "Create buildx multiarch" + command: | + docker buildx create \ + --name multiarch \ + --use \ + && docker buildx inspect \ + --bootstrap \ + --builder \ + multiarch + - run: + name: "Build image and push to Docker HUB" + command: | + docker buildx build \ + --cache-to=type=inline \ + --platform linux/arm/v6,linux/arm/v7,linux/arm64 \ + --build-arg COMPOSER_VERSION=$COMPOSER_VERSION \ + --build-arg XDEBUG_VERSION=$XDEBUG_VERSION \ + --build-arg MCRYPT_VERSION=$MCRYPT_VERSION \ + --tag $DOCKER_LOGIN/$DOCKER_IMAGE:cache-arm \ + --push \ + '.' + build_amd64: + executor: amd64_executor + steps: + - checkout + - run: + name: "Login to Docker HUB" + command: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD + - run: + name: "Install tonistiigi/binfmt" + command: docker run --rm --privileged tonistiigi/binfmt:$BINFMT_VERSION --install all + - run: + name: "Create buildx multiarch" + command: | + docker buildx create \ + --name multiarch \ + --use \ + && docker buildx inspect \ + --bootstrap \ + --builder \ + multiarch + - run: + name: "Build image and push to Docker HUB" + command: | + docker buildx build \ + --cache-from type=registry,ref=$DOCKER_LOGIN/$DOCKER_IMAGE:cache-arm \ + --platform linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 \ + --build-arg COMPOSER_VERSION=$COMPOSER_VERSION \ + --build-arg XDEBUG_VERSION=$XDEBUG_VERSION \ + --build-arg MCRYPT_VERSION=$MCRYPT_VERSION \ + --tag $DOCKER_LOGIN/$DOCKER_IMAGE:$CIRCLE_TAG \ + --tag $DOCKER_LOGIN/$DOCKER_IMAGE:latest \ + --push \ + "." + delete_cache_arm: + executor: amd64_executor + steps: + - run: + name: "Login to Docker HUB" + command: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD + - run: + name: "Remove cache arm image" + command: | + docker run \ + -it \ + --rm \ + --name $DOCKER_IMAGE \ + -e DOCKER_USERNAME=$DOCKER_LOGIN \ + -e DOCKER_PASSWORD=$DOCKER_PASSWORD \ + -e ORGANIZATION=$DOCKER_LOGIN \ + -e IMAGE=$DOCKER_IMAGE \ + -e TAG=cache-arm \ + $DOCKER_LOGIN/$DOCKER_IMAGE:$DELETE_TAG_TAG +workflows: + test_and_build_images: + jobs: + - test: + filters: + branches: + only: + - master + - develop + - build_arm64: + context: SECRETS + filters: + tags: + only: /.*/ + branches: + ignore: /.*/ + - build_amd64: + context: SECRETS + filters: + tags: + only: /.*/ + branches: + ignore: /.*/ + requires: + - build_arm64 + - delete_cache_arm: + context: SECRETS + filters: + tags: + only: /.*/ + branches: + ignore: /.*/ + requires: + - build_amd64 + diff --git a/.semaphore/build-deploy.yml b/.semaphore/build-deploy.yml deleted file mode 100644 index a9f0cb1..0000000 --- a/.semaphore/build-deploy.yml +++ /dev/null @@ -1,55 +0,0 @@ -version: v1.0 - -name: Build and deploy Pipeline -agent: - machine: - type: e1-standard-2 - os_image: ubuntu2004 -execution_time_limit: - hours: 3 - -global_job_config: - secrets: - - name: ACCESS_TOKENS - - prologue: - commands: - - echo $DOCKER_TOKEN | docker login --username "$DOCKER_USERNAME" --password-stdin - - env_vars: - - name: DOCKER_USERNAME - value: sineverba - - name: DOCKER_IMAGE - value: php74xc - - name: BUILDX_VERSION - value: 0.12.0 - - name: BINFMT_VERSION - value: qemu-v7.0.0-28 - -blocks: - - name: 'Build and deploy' - task: - jobs: - - name: 'Build and deploy' - 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 - - 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 "." \ No newline at end of file diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index fea67df..ac8bdb8 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -19,6 +19,12 @@ global_job_config: value: sineverba - name: DOCKER_IMAGE value: php74xc + - name: COMPOSER_VERSION + value: 1.10.27 + - name: XDEBUG_VERSION + value: 3.1.6 + - name: MCRYPT_VERSION + value: 1.0.7 blocks: - name: "Test" @@ -29,11 +35,17 @@ blocks: - name: "Build and test" commands: - checkout - - docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE . + - >- + docker build + --tag $DOCKER_USERNAME/$DOCKER_IMAGE + --build-arg COMPOSER_VERSION=$COMPOSER_VERSION + --build-arg XDEBUG_VERSION=$XDEBUG_VERSION + --build-arg MCRYPT_VERSION=$MCRYPT_VERSION + "." - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep 7.4.33 - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -v | grep OPcache - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep xdebug - - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep "3.1.5" + - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -r "xdebug_info();" | grep $XDEBUG_VERSION - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep pdo_pgsql - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.27" - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5995d91..9463a52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# 1.10.0 +# Next version ++ Upgrade dependencies + +## 1.10.0 + Upgrade dependencies ## 1.9.0 diff --git a/Dockerfile b/Dockerfile index 94bc5cc..eb21d51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ +ARG COMPOSER_VERSION +FROM composer:$COMPOSER_VERSION AS composer_downloader FROM php:7.4.33-cli - +ARG XDEBUG_VERSION +ARG MCRYPT_VERSION # OpCache settings ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" ENV XDEBUG_MODE="debug,coverage" @@ -21,14 +24,14 @@ RUN apt-get update -y && apt-get install -y \ RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Setup PHPXDebug -RUN pecl install xdebug-3.1.5 mcrypt-1.0.5 +RUN pecl install xdebug-${XDEBUG_VERSION} mcrypt-${MCRYPT_VERSION} # Install PHP extensions RUN docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd opcache zip \ && docker-php-ext-enable mysqli pdo pdo_mysql pdo_pgsql mbstring exif pcntl bcmath gd xdebug mcrypt # Get latest Composer -COPY --from=composer:1.10.27 /usr/bin/composer /usr/bin/composer +COPY --from=composer_downloader /usr/bin/composer /usr/bin/composer # Add custom ini files COPY config/10-shorttag.ini \ diff --git a/LICENSE b/LICENSE index 70b8774..1317b1c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2020 - 2023 sineverba +Copyright (c) 2020 - 2024 sineverba Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 4187ca8..52b48df 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,19 @@ IMAGE_NAME=sineverba/php74xc CONTAINER_NAME=php74xc APP_VERSION=1.10.0-dev -BUILDX_VERSION=0.12.0 +COMPOSER_VERSION=1.10.27 +XDEBUG_VERSION=3.1.6 +MCRYPT_VERSION=1.0.7 +BUILDX_VERSION=0.13.1 BINFMT_VERSION=qemu-v7.0.0-28 build: - docker build --tag $(IMAGE_NAME):$(APP_VERSION) . + docker build \ + --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) \ + --build-arg XDEBUG_VERSION=$(XDEBUG_VERSION) \ + --build-arg MCRYPT_VERSION=$(MCRYPT_VERSION) \ + --tag $(IMAGE_NAME):$(APP_VERSION) \ + "." preparemulti: mkdir -vp ~/.docker/cli-plugins @@ -24,14 +32,17 @@ preparemulti: multi: docker buildx inspect --bootstrap --builder multiarch docker buildx build \ - --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 \ + --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 \ + --build-arg COMPOSER_VERSION=$(COMPOSER_VERSION) \ + --build-arg XDEBUG_VERSION=$(XDEBUG_VERSION) \ + --build-arg MCRYPT_VERSION=$(MCRYPT_VERSION) \ --tag $(IMAGE_NAME):$(APP_VERSION) "." test: @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -v | grep 7.4.33 @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -v | grep OPcache @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep xdebug - @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -r "xdebug_info();" | grep "3.1.5" + @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -r "xdebug_info();" | grep $(XDEBUG_VERSION) @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep pdo_pgsql @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep zip @docker run --name $(CONTAINER_NAME) --rm $(IMAGE_NAME):$(APP_VERSION) php -m | grep mcrypt diff --git a/README.md b/README.md index 8be3fff..63f4aa2 100644 --- a/README.md +++ b/README.md @@ -21,19 +21,19 @@ Do you use it? **Star it!** | Github / Docker Image tag | PHP Version | Composer version | XDebug | Architectures | | ------------------------- | ----------- | ---------------- | ------ | ------------- | -| latest | 7.4.33 | 1.10.27 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.10.0 | 7.4.33 | 1.10.27 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.9.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.8.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.7.0 | 7.4.29 | 1.10.26 | 3.1.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.6.0 | 7.4.28 | 1.10.25 | 3.1.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.5.0 | 7.4.22 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.4.0 | 7.4.20 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.3.0 | 7.4.19 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.2.0 | 7.4.16 | 1.10.22 | 3.0.4 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.1.0 | 7.4.16 | 1.10.21 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.0.1 | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | -| 1.0.0 | 7.4.16 | 1.10.20 | 3.0.3 | linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| latest | 7.4.33 | 1.10.27 | 3.1.6 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.10.0 | 7.4.33 | 1.10.27 | 3.1.5 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.9.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.8.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.7.0 | 7.4.29 | 1.10.26 | 3.1.4 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.6.0 | 7.4.28 | 1.10.25 | 3.1.3 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.5.0 | 7.4.22 | 1.10.22 | 3.0.4 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.4.0 | 7.4.20 | 1.10.22 | 3.0.4 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.3.0 | 7.4.19 | 1.10.22 | 3.0.4 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.2.0 | 7.4.16 | 1.10.22 | 3.0.4 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.1.0 | 7.4.16 | 1.10.21 | 3.0.3 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.0.1 | 7.4.16 | 1.10.20 | 3.0.3 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.0.0 | 7.4.16 | 1.10.20 | 3.0.3 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | ## Xdebug and settings From 436ba2f171cb2f2eeb72b283c4ea9418902f7616 Mon Sep 17 00:00:00 2001 From: sineverba <2634842+sineverba@users.noreply.github.com> Date: Sun, 7 Apr 2024 23:06:54 +0200 Subject: [PATCH 2/3] Fix Semaphore and CircleCI (#102) * Fix Semaphore and CircleCI * Remove every start from CircleCI --------- Co-authored-by: Alessandro Arici --- .circleci/config.yml | 1 + .semaphore/semaphore.yml | 8 +------- CHANGELOG.md | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e54df0..a3f15da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,6 +134,7 @@ workflows: test_and_build_images: jobs: - test: + context: SECRETS filters: branches: only: diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index ac8bdb8..4a6a34d 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -49,10 +49,4 @@ blocks: - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -m | grep pdo_pgsql - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE /usr/bin/composer -V | grep "1.10.27" - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "short_open_tag => Off => Off" - - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M" - -promotions: - - name: Deploy - pipeline_file: build-deploy.yml - auto_promote: - when: "result = 'passed' and tag =~ '.*'" \ No newline at end of file + - docker run --rm $DOCKER_USERNAME/$DOCKER_IMAGE php -i | grep "memory_limit => 512M => 512M" \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9463a52..3da9d45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Next version + Upgrade dependencies ++ Fix Continuous integrations services ## 1.10.0 + Upgrade dependencies From 8356cae10ba7d74987978e397b0305c5751c1bc6 Mon Sep 17 00:00:00 2001 From: Alessandro Arici Date: Sun, 7 Apr 2024 23:08:44 +0200 Subject: [PATCH 3/3] Release 1.11.0 --- CHANGELOG.md | 2 +- Makefile | 2 +- README.md | 31 ++++--------------------------- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3da9d45..12ece2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Next version +# 1.11.0 + Upgrade dependencies + Fix Continuous integrations services diff --git a/Makefile b/Makefile index 52b48df..d1953a9 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ IMAGE_NAME=sineverba/php74xc CONTAINER_NAME=php74xc -APP_VERSION=1.10.0-dev +APP_VERSION=1.11.0-dev COMPOSER_VERSION=1.10.27 XDEBUG_VERSION=3.1.6 MCRYPT_VERSION=1.0.7 diff --git a/README.md b/README.md index 63f4aa2..35b5dab 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Do you use it? **Star it!** | Github / Docker Image tag | PHP Version | Composer version | XDebug | Architectures | | ------------------------- | ----------- | ---------------- | ------ | ------------- | | latest | 7.4.33 | 1.10.27 | 3.1.6 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | +| 1.11.0 | 7.4.33 | 1.10.27 | 3.1.6 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | | 1.10.0 | 7.4.33 | 1.10.27 | 3.1.5 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | | 1.9.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | | 1.8.0 | 7.4.33 | 1.10.26 | 3.1.5 | linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 | @@ -124,34 +125,10 @@ services: ``` bash $ cd ~ $ nano .bashrc -$ alias php74='docker run -it -w /data -v ${PWD}:/data --entrypoint php --rm sineverba/php74xc:latest' -$ alias composer74='docker run -it -w /data -v ${PWD}:/data --entrypoint "/usr/bin/composer" --rm sineverba/php74xc:latest' +$ alias php74='docker run -it -w /data -v ${PWD}:/data --entrypoint php --rm sineverba/php74xc:1.11.0' +$ alias composer74='docker run -it -w /data -v ${PWD}:/data --entrypoint "/usr/bin/composer" --rm sineverba/php74xc:1.11.0' ``` ### Issues with memory limit (on composer) -`$ php -d memory_limit=-1 /usr/bin/composer require [...]` - -#### Build and test image locally - -```shell -$ make build -$ make test -$ make destroy -``` - -+ Check images list - -`$ docker image ls` - -+ Clone the project - -`$ git clone git@github.com:sineverba/php74xc.git` - -+ Run from same folder - -`$ docker build --tag php74xc:x.y.z .` - -+ Check new image (php74xc:x.y.z) - -`$ docker image ls` \ No newline at end of file +`$ php -d memory_limit=-1 /usr/bin/composer require [...]` \ No newline at end of file