Skip to content

Commit

Permalink
pdo_pgsql ext added.
Browse files Browse the repository at this point in the history
  • Loading branch information
roquie committed Aug 6, 2021
1 parent 948fff2 commit bab9800
Show file tree
Hide file tree
Showing 11 changed files with 96 additions and 44 deletions.
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,58 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.5.0] - 2021-08-06

### Added

* pdo_pgsql ext

### Changed

*None*

### Deprecated

*None*

### Removed

*None*

### Fixed

*None*

### Security

*None*

## [1.4.1] - 2021-08-06

### Added

*None*

### Changed

*None*

### Deprecated

*None*

### Removed

*None*

### Fixed

* `bash` to xdebug images. ;)

### Security

*None*

## [1.4.0] - 2021-08-06

### Added
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 1.4.0
VERSION = 1.5.0
PUSH = false

include base74.mk
Expand Down
54 changes: 27 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,40 @@ Docker image configured for <a href="https://roadrunner.dev/">roadrunner</a> in

Simple image with PHP, RoadRunner and pre-installed extensions:

* `spacetabio/roadrunner-alpine:7.4-base-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-base-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:7.4-spiral-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-spiral-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:7.4-base-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-1.5.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-base-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-1.5.0?style=flat-square)
* `spacetabio/roadrunner-alpine:7.4-spiral-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-1.5.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-spiral-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-1.5.0?style=flat-square)

With xdebug:

* `spacetabio/roadrunner-alpine:7.4-base-xdebug-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-xdebug-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-base-xdebug-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-xdebug-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:7.4-spiral-xdebug-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-xdebug-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-spiral-xdebug-1.4.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.4.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-xdebug-1.4.0?style=flat-square)
* `spacetabio/roadrunner-alpine:7.4-base-xdebug-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-base-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-base-xdebug-1.5.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-base-xdebug-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-base-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-base-xdebug-1.5.0?style=flat-square)
* `spacetabio/roadrunner-alpine:7.4-spiral-xdebug-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/7.4-spiral-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/7.4-spiral-xdebug-1.5.0?style=flat-square)
* `spacetabio/roadrunner-alpine:8.0-spiral-xdebug-1.5.0` <br>
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/spacetabio/roadrunner-alpine/8.0-spiral-1.5.0?style=flat-square)
![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/spacetabio/roadrunner-alpine/8.0-spiral-xdebug-1.5.0?style=flat-square)

## Basic usage

Roadrunner:

```Dockerfile
FROM spacetabio/roadrunner-alpine:8.0-base-1.4.0
FROM spacetabio/roadrunner-alpine:8.0-base-1.5.0

COPY . /app

Expand All @@ -54,7 +54,7 @@ CMD ["rr", "serve", "-c", ".rr.yaml"]
Spiral:

```Dockerfile
FROM spacetabio/roadrunner-alpine:8.0-spiral-1.4.0
FROM spacetabio/roadrunner-alpine:8.0-spiral-1.5.0

COPY . /app

Expand Down Expand Up @@ -113,7 +113,7 @@ ENV PHP_OPCACHE_FILE_CACHE_ONLY=1
Format: `{phpVersion}-{imageType}-{semverImageVersion}`

Map:
- Image tag `*-1.4.0` contains RoadRunner `2.3.3` and Spiral binary (in separate images).
- Image tag `*-1.4.0+` contains RoadRunner `2.3.3` and Spiral binary (in separate images).
- Image tag `*-1.3.0` contains RoadRunner `2.3.3`.
- Image tag `*-1.2.0` contains RoadRunner `1.8.1`.
- Image tag `*-1.1.0` contains RoadRunner `1.8.0`.
Expand Down
4 changes: 2 additions & 2 deletions base-xdebug/7.4/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:7.4-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache bash pcre icu yaml libuv libpq libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& pecl install xdebug \
Expand Down
4 changes: 2 additions & 2 deletions base-xdebug/8.0/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:8.0-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& pecl install xdebug \
Expand Down
4 changes: 2 additions & 2 deletions base/7.4/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:7.4-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& apk del build-dependencies
Expand Down
4 changes: 2 additions & 2 deletions base/8.0/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:8.0-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& apk del build-dependencies
Expand Down
4 changes: 2 additions & 2 deletions spiral-xdebug/7.4/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:7.4-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& pecl install xdebug \
Expand Down
4 changes: 2 additions & 2 deletions spiral-xdebug/8.0/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:8.0-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache bash pcre icu yaml libpq libuv libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& pecl install xdebug \
Expand Down
4 changes: 2 additions & 2 deletions spiral/7.4/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:7.4-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& apk del build-dependencies
Expand Down
4 changes: 2 additions & 2 deletions spiral/8.0/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM php:8.0-cli-alpine AS build

RUN apk add --update --no-cache pcre icu yaml libuv libpng libjpeg libexif libzip \
RUN apk add --update --no-cache pcre icu yaml libuv libpq libpng libjpeg libexif libzip \
&& apk add --update --no-cache --virtual build-dependencies \
autoconf g++ libtool pcre make icu-dev postgresql-dev \
postgresql-libs libsasl db yaml-dev libuv-dev freetype-dev libjpeg-turbo-dev jpeg-dev libexif-dev libpng-dev libzip-dev \
&& docker-php-ext-configure gd --with-jpeg \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql sockets exif zip \
&& docker-php-ext-install -j $(nproc) pcntl opcache intl gd pdo_mysql pdo_pgsql sockets exif zip \
&& pecl install yaml \
&& docker-php-ext-enable yaml \
&& apk del build-dependencies
Expand Down

0 comments on commit bab9800

Please sign in to comment.