Skip to content

Commit

Permalink
fix(repo): remove codecast
Browse files Browse the repository at this point in the history
  • Loading branch information
jorge07 committed Nov 25, 2021
1 parent c3edba2 commit 443acac
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 125 deletions.
82 changes: 38 additions & 44 deletions 7.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,51 +1,45 @@
FROM alpine:3.11 as main
FROM alpine:3.12 as main

LABEL maintainer="Jorge Arco <jorge.arcoma@gmail.com>"

ADD https://packages.whatwedo.ch/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub

RUN apk --update add ca-certificates \
&& echo "@cast https://packages.whatwedo.ch/php-alpine/v3.11/php-7.3" >> /etc/apk/repositories \
&& apk add -U \
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv \
&& apk add -U --no-cache \
# Packages
tini \
php7@cast \
php7-amqp@cast \
php7-dev@cast \
php7-common@cast \
php7-apcu@cast \
php7-gd@cast \
php7-xmlreader@cast \
php7-bcmath@cast \
php7-ctype@cast \
php7-curl@cast \
php7-exif@cast \
php7-iconv@cast \
php7-intl@cast \
php7-json@cast \
php7-mbstring@cast \
php7-opcache@cast \
php7-openssl@cast \
php7-pcntl@cast \
php7-pdo@cast \
php7-mysqlnd@cast \
php7-pdo_mysql@cast \
php7-pdo_pgsql@cast \
php7-phar@cast \
php7-posix@cast \
php7-session@cast \
php7-xml@cast \
php7-xsl@cast \
php7-zip@cast \
php7-zlib@cast \
php7-dom@cast \
php7-redis@cast \
php7-fpm@cast \
php7-sodium@cast \
&& apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv \
# Clean up
&& ln -s /usr/bin/php7 /usr/bin/php \
&& rm -rf /var/cache/apk/*
php7 \
php7-amqp \
php7-dev \
php7-common \
php7-pecl-apcu \
php7-gd \
php7-xmlreader \
php7-bcmath \
php7-ctype \
php7-curl \
php7-exif \
php7-iconv \
php7-intl \
php7-json \
php7-mbstring \
php7-opcache \
php7-openssl \
php7-pcntl \
php7-pdo \
php7-mysqlnd \
php7-pdo_mysql \
php7-pdo_pgsql \
php7-phar \
php7-posix \
php7-session \
php7-xml \
php7-xsl \
php7-zip \
php7-zlib \
php7-dom \
php7-redis \
php7-fpm \
php7-sodium

# iconv hack https://github.com/docker-library/php/issues/240
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php

Expand Down Expand Up @@ -76,7 +70,7 @@ RUN apk add -U --no-cache \
wget \
make \
zip \
php7-xdebug@cast \
php7-xdebug \

&& rm -rf /var/cache/apk/* \

Expand Down
82 changes: 37 additions & 45 deletions 7.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,52 +1,44 @@
FROM alpine:3.12 as main
FROM alpine:3.14 as main

LABEL maintainer="Jorge Arco <jorge.arcoma@gmail.com>"

ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub

RUN apk --update add ca-certificates \
&& echo "https://dl.bintray.com/php-alpine/v3.12/php-7.4" >> /etc/apk/repositories \
&& apk add -U \
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv \
&& apk add -U --no-cache \
# Packages
tini \
php7@cast \
php7-amqp@cast \
php7-dev@cast \
php7-common@cast \
php7-apcu@cast \
php7-gd@cast \
php7-xmlreader@cast \
php7-bcmath@cast \
php7-ctype@cast \
php7-curl@cast \
php7-exif@cast \
php7-iconv@cast \
php7-intl@cast \
php7-json@cast \
php7-mbstring@cast \
php7-opcache@cast \
php7-openssl@cast \
php7-pcntl@cast \
php7-pdo@cast \
php7-mysqlnd@cast \
php7-pdo_mysql@cast \
php7-pdo_pgsql@cast \
php7-phar@cast \
php7-posix@cast \
php7-session@cast \
php7-xml@cast \
php7-xsl@cast \
php7-zip@cast \
php7-zlib@cast \
php7-dom@cast \
php7-redis@cast \
php7-fpm@cast \
php7-sodium@cast \
# Iconv Fix
&& apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv \
# Clean up
&& ln -s /usr/bin/php7 /usr/bin/php \
&& rm -rf /var/cache/apk/*
php7 \
php7-amqp \
php7-dev \
php7-common \
php7-apcu \
php7-gd \
php7-xmlreader \
php7-bcmath \
php7-ctype \
php7-curl \
php7-exif \
php7-iconv \
php7-intl \
php7-json \
php7-mbstring \
php7-opcache \
php7-openssl \
php7-pcntl \
php7-pdo \
php7-mysqlnd \
php7-pdo_mysql \
php7-pdo_pgsql \
php7-phar \
php7-posix \
php7-session \
php7-xml \
php7-xsl \
php7-zip \
php7-zlib \
php7-dom \
php7-redis \
php7-fpm \
php7-sodium

# iconv hack https://github.com/docker-library/php/issues/240
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
Expand Down Expand Up @@ -78,7 +70,7 @@ RUN apk add -U --no-cache \
wget \
make \
zip \
php7-xdebug@cast \
php7-xdebug \
# Delete APK cache.
&& rm -rf /var/cache/apk/* \
# Create ssh user for dev.
Expand Down
66 changes: 30 additions & 36 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,44 +1,38 @@
FROM alpine:3.12 as main
FROM alpine:3.14 as main

LABEL maintainer="Jorge Arco <jorge.arcoma@gmail.com>"

ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub

RUN apk --update add ca-certificates \
&& echo "https://dl.bintray.com/php-alpine/v3.12/php-8.0" >> /etc/apk/repositories \
&& apk add -U \
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv \
&& apk add -U --no-cache \
# Packages
tini \
php8@cast \
php8-dev@cast \
php8-common@cast \
php8-apcu@cast \
php8-gd@cast \
php8-xmlreader@cast \
php8-bcmath@cast \
php8-ctype@cast \
php8-curl@cast \
php8-exif@cast \
php8-iconv@cast \
php8-intl@cast \
php8-mbstring@cast \
php8-opcache@cast \
php8-openssl@cast \
php8-pcntl@cast \
php8-phar@cast \
php8-session@cast \
php8-xml@cast \
php8-xsl@cast \
php8-zip@cast \
php8-zlib@cast \
php8-dom@cast \
php8-fpm@cast \
php8-sodium@cast \
php8 \
php8-dev \
php8-common \
php8-gd \
php8-xmlreader \
php8-bcmath \
php8-ctype \
php8-curl \
php8-exif \
php8-iconv \
php8-intl \
php8-mbstring \
php8-opcache \
php8-openssl \
php8-pcntl \
php8-phar \
php8-session \
php8-xml \
php8-xsl \
php8-zip \
php8-zlib \
php8-dom \
php8-fpm \
php8-sodium \
# Iconv Fix
&& apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv \
# Clean up
&& ln -s /usr/bin/php8 /usr/bin/php \
&& rm -rf /var/cache/apk/*
&& apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted php8-pecl-apcu \
&& ln -s /usr/bin/php8 /usr/bin/php

ADD rootfs /

Expand Down Expand Up @@ -67,7 +61,7 @@ RUN apk add -U --no-cache \
wget \
make \
zip \
php8-xdebug@cast \
php8-xdebug \
# Delete APK cache.
&& rm -rf /var/cache/apk/* \
# Create ssh user for dev.
Expand Down
16 changes: 16 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,19 @@ release: build
docker push ${REPO}:${SEMVER}
docker push ${REPO}:${VERSION}-dev
docker push ${REPO}:${SEMVER}-dev
test-all: test-all
VERSION=8.0 make build
VERSION=7.4 make build
VERSION=7.3 make build
VERSION=7.2 make build
VERSION=7.1 make build
VERSION=8.0 make test-main
VERSION=7.4 make test-main
VERSION=7.3 make test-main
VERSION=7.2 make test-main
VERSION=7.1 make test-main
VERSION=8.0 make test-dev
VERSION=7.4 make test-dev
VERSION=7.3 make test-dev
VERSION=7.2 make test-dev
VERSION=7.1 make test-dev

0 comments on commit 443acac

Please # to comment.