From 1f1713e81ca52854cecddfefde352899246803fd Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Thu, 25 Mar 2021 08:32:34 +0100 Subject: [PATCH] removed Travis references, fixed image suffix (#124) --- .github/workflows/docker-image.yml | 4 +- .travis.yml | 72 ------------------------------ README.md | 6 +-- 3 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 5f915e5..146d279 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -80,7 +80,7 @@ jobs: - uses: actions/checkout@v1 - name: Set version suffix if: startsWith(github.ref, 'refs/tags/') - run: echo "PHP_IMAGE_VERSION_SUFFIX=${GITHUB_REF:10}" >> $GITHUB_ENV + run: echo "PHP_IMAGE_VERSION_SUFFIX=-${GITHUB_REF:10}" >> $GITHUB_ENV - name: Install env: TEST_YII_VERSION: "a777c2e8f69dc753f8a945b1dd54bbaaa1e9e66c" @@ -112,4 +112,4 @@ jobs: password: ${{ secrets.DOCKERHUB_PASS }} - name: Push docker image if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' - run: docker-compose push \ No newline at end of file + run: docker-compose push diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0d62e6a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,72 +0,0 @@ -language: bash -services: docker - -env: - - PHP_BASE_IMAGE_VERSION=5.6-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_MONGODB_INSTALL_SUFFIX=-1.5.5 - - PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2 - - PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8 - - PHP_BASE_IMAGE_VERSION=7.2-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - PHP_BASE_IMAGE_VERSION=7.3-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - PHP_BASE_IMAGE_VERSION=7.4-fpm DOCKERFILE_FLAVOUR=debian - - PHP_BASE_IMAGE_VERSION=5.6-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2 - - PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8 - - PHP_BASE_IMAGE_VERSION=7.2-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - PHP_BASE_IMAGE_VERSION=7.3-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - PHP_BASE_IMAGE_VERSION=7.4-apache - -matrix: - allow_failures: - # Deprecated PHP versions - - env: PHP_BASE_IMAGE_VERSION=5.6-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_MONGODB_INSTALL_SUFFIX=-1.5.5 - - env: PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2 - - env: PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8 - - env: PHP_BASE_IMAGE_VERSION=7.2-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - env: PHP_BASE_IMAGE_VERSION=5.6-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - - env: PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.7.2 - - env: PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 PECL_XDEBUG_INSTALL_SUFFIX=-2.9.8 - - env: PHP_BASE_IMAGE_VERSION=7.2-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1 - -before_install: - - export TEST_YII_VERSION=a777c2e8f69dc753f8a945b1dd54bbaaa1e9e66c - - export DOCKER_COMPOSE_VERSION=1.25.4 - - export PHP_IMAGE_NAME=yiisoftware/yii2-php - - if [ -n "$TRAVIS_TAG" ]; then export PHP_IMAGE_VERSION_SUFFIX=-${TRAVIS_TAG}; fi - - sudo apt-get update - - sudo apt-get install docker-ce - - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - - chmod +x docker-compose - - sudo mv docker-compose /usr/local/bin - -install: - - git clone https://github.com/yiisoft/yii2 _host-volumes/yii2 - - pushd _host-volumes/yii2 && git checkout ${TEST_YII_VERSION} && popd - - cp .env-dist .env - -before_script: - - pwd - - docker version - - docker info - - docker-compose version - -script: - - echo "travis_fold:start:BUILD folding starts" - - docker-compose build --build-arg X_LEGACY_GD_LIB=$X_LEGACY_GD_LIB - - echo "travis_fold:end:BUILD folding ends" - - docker-compose run --rm php php -v - - docker-compose run --rm -e PHP_ENABLE_XDEBUG=1 php php -v - - docker-compose run --rm php php /tests/requirements.php - - docker-compose run --rm -w /yii2 php composer install --prefer-dist - - docker-compose run --rm -w /yii2 php php -d error_reporting="E_ALL ^ E_DEPRECATED" vendor/bin/phpunit tests/framework/ --exclude db - -after_success: - - if [[ ($TRAVIS_PULL_REQUEST = "false" && $TRAVIS_BRANCH = "master") || -n "$TRAVIS_TAG" ]]; then - echo $DOCKERHUB_PASS | docker login -u $DOCKERHUB_USER --password-stdin && - travis_retry docker-compose push; - fi - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index 48be080..6c57f31 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,7 @@

-**Stable** -[![Build Status](https://travis-ci.org/yiisoft/yii2-docker.svg?branch=master)](https://travis-ci.org/yiisoft/yii2-docker) -**Development** -[![pipeline status](https://gitlab.com/yiisoft/yii2-docker/badges/master/pipeline.svg)](https://gitlab.com/yiisoft/yii2-docker/commits/master) - +[![Build Status](https://github.com/yiisoft/yii2-docker/actions/workflows/docker-image.yml/badge.svg)](https://github.com/yiisoft/yii2-docker/actions/workflows/docker-image.yml) This is the repo of the official [Yii 2.0 Framework](http://www.yiiframework.com/) image on [DockerHub](https://hub.docker.com/r/yiisoftware/yii2-php/) for PHP.