Skip to content

Commit

Permalink
Upgrade composer version to 2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@limingxinleo
limingxinleo committed Oct 26, 2020
1 parent e76fcfd commit 9ced4cd
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-swoole.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: [push]
env:
ENGINE: "swoole"
SW_VERSION: "v4.5.5"
COMPOSER_VERSION: "2.0.2"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-swow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: [push]
env:
ENGINE: "swow"
SW_VERSION: "develop"
COMPOSER_VERSION: "2.0.2"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
build:
Expand Down
4 changes: 3 additions & 1 deletion 7.3/alpine/swoole/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ FROM hyperf/hyperf:7.3-alpine-v${ALPINE_VERSION}-base
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"

ARG SW_VERSION
ARG COMPOSER_VERSION

##
# ---------- env settings ----------
##
ENV SW_VERSION=${SW_VERSION:-"4.5.2"} \
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
# install and remove building packages
PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php7-dev php7-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake"

Expand Down Expand Up @@ -47,7 +49,7 @@ RUN set -ex \
&& echo "swoole.use_shortname = 'Off'" >> /etc/php7/conf.d/50_swoole.ini \
# install composer
&& cd /tmp \
&& wget https://github.com/composer/composer/releases/download/1.10.15/composer.phar \
&& wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
&& chmod u+x composer.phar \
&& mv composer.phar /usr/local/bin/composer \
# php info
Expand Down
4 changes: 3 additions & 1 deletion 7.3/alpine/swow/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ FROM hyperf/hyperf:7.3-alpine-v${ALPINE_VERSION}-base
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"

ARG SW_VERSION
ARG COMPOSER_VERSION

##
# ---------- env settings ----------
##
ENV SW_VERSION=${SW_VERSION:-"develop"} \
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
# install and remove building packages
PHPIZE_DEPS="autoconf automake gcc g++ make php7-dev php7-pear file re2c"

Expand Down Expand Up @@ -46,7 +48,7 @@ RUN set -ex \
&& echo "extension=swow.so" > /etc/php7/conf.d/50_swow.ini \
# install composer
&& cd /tmp \
&& wget https://github.com/composer/composer/releases/download/1.10.15/composer.phar \
&& wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
&& chmod u+x composer.phar \
&& mv composer.phar /usr/local/bin/composer \
# php info
Expand Down
4 changes: 3 additions & 1 deletion 7.4/alpine/swoole/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ FROM hyperf/hyperf:7.4-alpine-v${ALPINE_VERSION}-base
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"

ARG SW_VERSION
ARG COMPOSER_VERSION

##
# ---------- env settings ----------
##
ENV SW_VERSION=${SW_VERSION:-"4.5.2"} \
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
# install and remove building packages
PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make php7-dev php7-pear pkgconf re2c pcre-dev pcre2-dev zlib-dev libtool automake"

Expand Down Expand Up @@ -47,7 +49,7 @@ RUN set -ex \
&& echo "swoole.use_shortname = 'Off'" >> /etc/php7/conf.d/50_swoole.ini \
# install composer
&& cd /tmp \
&& wget https://github.com/composer/composer/releases/download/1.10.15/composer.phar \
&& wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
&& chmod u+x composer.phar \
&& mv composer.phar /usr/local/bin/composer \
# php info
Expand Down
4 changes: 3 additions & 1 deletion 7.4/alpine/swow/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ FROM hyperf/hyperf:7.4-alpine-v${ALPINE_VERSION}-base
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT"

ARG SW_VERSION
ARG COMPOSER_VERSION

##
# ---------- env settings ----------
##
ENV SW_VERSION=${SW_VERSION:-"develop"} \
COMPOSER_VERSION=${COMPOSER_VERSION:-"2.0.2"} \
# install and remove building packages
PHPIZE_DEPS="autoconf automake gcc g++ make php7-dev php7-pear file re2c"

Expand Down Expand Up @@ -46,7 +48,7 @@ RUN set -ex \
&& echo "extension=swow.so" > /etc/php7/conf.d/50_swow.ini \
# install composer
&& cd /tmp \
&& wget https://github.com/composer/composer/releases/download/1.10.15/composer.phar \
&& wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
&& chmod u+x composer.phar \
&& mv composer.phar /usr/local/bin/composer \
# php info
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ services:
args:
ALPINE_VERSION: ${ALPINE_VERSION}
SW_VERSION: ${SW_VERSION}
COMPOSER_VERSION: ${COMPOSER_VERSION}

# swow image
alpine-swow:
Expand All @@ -28,6 +29,7 @@ services:
args:
ALPINE_VERSION: ${ALPINE_VERSION}
SW_VERSION: ${SW_VERSION}
COMPOSER_VERSION: ${COMPOSER_VERSION}

# dev image
alpine-dev:
Expand Down

0 comments on commit 9ced4cd

Please sign in to comment.