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

Version Bumps #90

Merged
merged 4 commits into from
Feb 16, 2024
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
10 changes: 5 additions & 5 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.1
FROM alpine:3.19.1

# Install basic pacakges
RUN set -xe; \
Expand All @@ -17,9 +17,9 @@ RUN set -xe; \

# Install docker packages
# Lookup available version for Alpine at
# https://pkgs.alpinelinux.org/packages?name=docker*&branch=v3.14&arch=x86_64
ARG DOCKER_VERSION=20.10.24-r0
ARG DOCKER_COMPOSE_VERSION=1.29.2-r2
# https://pkgs.alpinelinux.org/packages?name=docker*&branch=v3.19&arch=x86_64
ARG DOCKER_VERSION=25.0.3-r0
ARG DOCKER_COMPOSE_VERSION=2.23.3-r0
RUN set -xe; \
apk add --update --no-cache \
docker-cli=${DOCKER_VERSION} \
Expand All @@ -28,7 +28,7 @@ RUN set -xe; \
rm -rf /var/cache/apk/*;

# Install minio client (mc)
ARG MINIO_VERSION="RELEASE.2021-03-23T05-46-11Z"
ARG MINIO_VERSION="RELEASE.2024-02-14T21-19-52Z"
RUN set -xe; \
curl -fsSL https://dl.min.io/client/mc/release/linux-amd64/archive/mc.${MINIO_VERSION} -o /usr/local/bin/mc; \
chmod +x /usr/local/bin/mc
Expand Down
40 changes: 20 additions & 20 deletions php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@ USER root
RUN set -xe; \
apk add --update --no-cache \
mysql-client \
php81 \
php81-ctype \
php81-curl \
php81-dom \
php81-gd \
php81-json \
php81-mbstring \
php81-openssl \
php81-pdo_mysql \
php81-phar \
php81-posix \
php81-simplexml \
php81-tokenizer \
php81-xml \
php81-xmlreader \
php81-xmlwriter \
php81-zlib; \
php82 \
php82-ctype \
php82-curl \
php82-dom \
php82-gd \
php82-json \
php82-mbstring \
php82-openssl \
php82-pdo_mysql \
php82-phar \
php82-posix \
php82-simplexml \
php82-tokenizer \
php82-xml \
php82-xmlreader \
php82-xmlwriter \
php82-zlib; \
rm -rf /var/cache/apk/*;

ENV COMPOSER_VERSION=2.5.1 \
DRUSH_VERSION=8.4.11 \
ENV COMPOSER_VERSION=2.7.1 \
DRUSH_VERSION=8.4.12 \
DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \
WPCLI_VERSION=2.6.0
WPCLI_VERSION=2.10.0
RUN set -xe; \
# Composer
curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer; \
Expand Down
6 changes: 3 additions & 3 deletions tests/base.bats
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ teardown() {

run make exec COMMAND="docker-compose --version"
[[ "$status" == 0 ]]
echo "$output" | grep "docker-compose version"
echo "$output" | grep "Docker Compose version"
unset output

run make exec COMMAND="mc --help"
run make exec COMMAND="mc --version"
[[ "$status" == 0 ]]
echo "$output" | grep "VERSION"
echo "$output" | grep "mc version"
unset output

### Cleanup ###
Expand Down
1 change: 1 addition & 0 deletions tests/php-modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ PDO
pdo_mysql
Phar
posix
random
readline
Reflection
SimpleXML
Expand Down
Loading