Skip to content

Commit 2bf050c

Browse files
KantiKanti
committed
[WIP] arm
1 parent 146a08f commit 2bf050c

File tree

18 files changed

+171
-3892
lines changed

18 files changed

+171
-3892
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 127 additions & 3842 deletions
Large diffs are not rendered by default.

‎build-local.sh‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,30 @@ PHP_VERSION=8.5
1111

1212
if [ "$#" -gt 0 ]; then
1313
PHP_VERSION=$1
14-
if [ ! -d "$ROOT_DIR/docker/php/$PHP_VERSION" ]; then
14+
if [ ! -d "docker/php/$PHP_VERSION" ]; then
1515
echo "PHP version $PHP_VERSION not found"
1616
exit 1
1717
fi
1818
fi
1919

2020
# alpine
21-
cd $ROOT_DIR/docker/php/$PHP_VERSION-alpine
22-
docker build -t webdevops/php:$PHP_VERSION-alpine .
23-
cd $ROOT_DIR/docker/php-dev/$PHP_VERSION-alpine
24-
docker build -t webdevops/php-dev:$PHP_VERSION-alpine .
21+
docker build -t webdevops/php:$PHP_VERSION-alpine docker/php/$PHP_VERSION-alpine
22+
docker build -t webdevops/php-dev:$PHP_VERSION-alpine docker/php-dev/$PHP_VERSION-alpine
2523

26-
cd $ROOT_DIR/docker/php-nginx/$PHP_VERSION-alpine
27-
docker build -t webdevops/php-nginx:$PHP_VERSION-alpine .
28-
cd $ROOT_DIR/docker/php-nginx-dev/$PHP_VERSION-alpine
29-
docker build -t webdevops/php-nginx-dev:$PHP_VERSION-alpine .
24+
docker build -t webdevops/php-nginx:$PHP_VERSION-alpine docker/php-nginx/$PHP_VERSION-alpine
25+
docker build -t webdevops/php-nginx-dev:$PHP_VERSION-alpine docker/php-nginx-dev/$PHP_VERSION-alpine
3026

31-
cd $ROOT_DIR/docker/php-apache/$PHP_VERSION-alpine
32-
docker build -t webdevops/php-apache:$PHP_VERSION-alpine .
33-
cd $ROOT_DIR/docker/php-apache-dev/$PHP_VERSION-alpine
34-
docker build -t webdevops/php-apache-dev:$PHP_VERSION-alpine .
27+
docker build -t webdevops/php-apache:$PHP_VERSION-alpine docker/php-apache/$PHP_VERSION-alpine
28+
docker build -t webdevops/php-apache-dev:$PHP_VERSION-alpine docker/php-apache-dev/$PHP_VERSION-alpine
3529

3630
# debian
37-
cd $ROOT_DIR/docker/php/$PHP_VERSION
38-
docker build -t webdevops/php:$PHP_VERSION .
39-
cd $ROOT_DIR/docker/php-dev/$PHP_VERSION
40-
docker build -t webdevops/php-dev:$PHP_VERSION .
41-
42-
cd $ROOT_DIR/docker/php-nginx/$PHP_VERSION
43-
docker build -t webdevops/php-nginx:$PHP_VERSION .
44-
cd $ROOT_DIR/docker/php-nginx-dev/$PHP_VERSION
45-
docker build -t webdevops/php-nginx-dev:$PHP_VERSION .
46-
47-
cd $ROOT_DIR/docker/php-apache/$PHP_VERSION
48-
docker build -t webdevops/php-apache:$PHP_VERSION .
49-
cd $ROOT_DIR/docker/php-apache-dev/$PHP_VERSION
50-
docker build -t webdevops/php-apache-dev:$PHP_VERSION .
31+
docker build -t webdevops/php:$PHP_VERSION docker/php/$PHP_VERSION
32+
docker build -t webdevops/php-dev:$PHP_VERSION docker/php-dev/$PHP_VERSION
33+
34+
docker build -t webdevops/php-nginx:$PHP_VERSION docker/php-nginx/$PHP_VERSION
35+
docker build -t webdevops/php-nginx-dev:$PHP_VERSION docker/php-nginx-dev/$PHP_VERSION
36+
37+
docker build -t webdevops/php-apache:$PHP_VERSION docker/php-apache/$PHP_VERSION
38+
docker build -t webdevops/php-apache-dev:$PHP_VERSION docker/php-apache-dev/$PHP_VERSION
5139

5240
docker images | grep webdevops | grep $PHP_VERSION

‎ci/src/GithubJobBuilder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function getJobDescription(array $node): array
2222
'steps' => array_values(
2323
array_filter(
2424
[
25-
['uses' => 'actions/checkout@v4'],
25+
['uses' => 'actions/checkout@v6'],
2626
// ['uses' => 'docker/setup-qemu-action@v3'], // only needed for ARM builds
2727
['uses' => 'docker/setup-buildx-action@v3'],
2828
[
@@ -133,7 +133,7 @@ public function getValidationConfig(): array
133133
'name' => 'Validate Automation',
134134
'runs-on' => 'ubuntu-latest',
135135
'steps' => [
136-
['uses' => 'actions/checkout@v4'],
136+
['uses' => 'actions/checkout@v6'],
137137
[
138138
'name' => 'Validate that template/* are used to generate Dockerfiles',
139139
'run' => implode("\n", [

‎docker/dockerfile-build-env/latest/Dockerfile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#+++++++++++++++++++++++++++++++++++++++
55

66
FROM webdevops/base-app:ubuntu-22.04
7+
ARG TARGETARCH
78

89
RUN apt-install \
910
build-essential \
@@ -19,18 +20,20 @@ RUN apt-install \
1920
ruby \
2021
ruby-dev \
2122
ruby-bundler \
23+
libyaml-dev \
2224
&& curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
2325
&& python2 get-pip.py \
2426
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
25-
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
27+
&& add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
2628
&& apt-install docker-ce \
2729
&& usermod -aG docker application \
28-
&& curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 \
29-
&& chmod +x container-structure-test-linux-amd64 \
30-
&& mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test \
30+
&& curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-$TARGETARCH \
31+
&& chmod +x container-structure-test-linux-$TARGETARCH \
32+
&& mv container-structure-test-linux-$TARGETARCH /usr/local/bin/container-structure-test \
3133
&& pip install --upgrade pip \
3234
&& hash -r pip \
3335
&& pip install --upgrade setuptools \
36+
&& pip install Cython==0.29.21 wheel \
3437
&& git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \
3538
&& gem install bundler -v 2.1.4 --no-document \
3639
&& cd /tmp/Dockerfile/tests/serverspec \

‎docker/dockerfile-build-env/latest/Dockerfile.jinja2‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{{ docker.from("base-app","ubuntu-22.04") }}
2+
ARG TARGETARCH
23

34
RUN apt-install \
45
build-essential \
@@ -14,18 +15,20 @@ RUN apt-install \
1415
ruby \
1516
ruby-dev \
1617
ruby-bundler \
18+
libyaml-dev \
1719
&& curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
1820
&& python2 get-pip.py \
1921
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
20-
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
22+
&& add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
2123
&& apt-install docker-ce \
2224
&& usermod -aG docker application \
23-
&& curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64 \
24-
&& chmod +x container-structure-test-linux-amd64 \
25-
&& mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test \
25+
&& curl -LO https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-$TARGETARCH \
26+
&& chmod +x container-structure-test-linux-$TARGETARCH \
27+
&& mv container-structure-test-linux-$TARGETARCH /usr/local/bin/container-structure-test \
2628
&& pip install --upgrade pip \
2729
&& hash -r pip \
2830
&& pip install --upgrade setuptools \
31+
&& pip install Cython==0.29.21 wheel \
2932
&& git clone --depth 1 https://github.com/webdevops/Dockerfile.git /tmp/Dockerfile \
3033
&& gem install bundler -v 2.1.4 --no-document \
3134
&& cd /tmp/Dockerfile/tests/serverspec \

‎docker/php-official/5.6/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN set -x \
141141
# Install extensions
142142
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
143143
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
144-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
144+
&& docker-php-ext-configure ldap \
145145
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
146146
&& docker-php-ext-install \
147147
bcmath \

‎docker/php-official/7.0/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN set -x \
141141
# Install extensions
142142
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
143143
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
144-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
144+
&& docker-php-ext-configure ldap \
145145
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
146146
&& docker-php-ext-install \
147147
bcmath \

‎docker/php-official/7.1/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN set -x \
141141
# Install extensions
142142
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
143143
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
144-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
144+
&& docker-php-ext-configure ldap \
145145
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
146146
&& docker-php-ext-install \
147147
bcmath \

‎docker/php-official/7.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN set -x \
141141
# Install extensions
142142
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
143143
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
144-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
144+
&& docker-php-ext-configure ldap \
145145
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
146146
&& docker-php-ext-install \
147147
bcmath \

‎docker/php-official/7.3/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ RUN set -x \
141141
# Install extensions
142142
&& docker-php-ext-configure intl --with-icu-dir=/usr/local \
143143
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
144-
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
144+
&& docker-php-ext-configure ldap \
145145
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
146146
&& docker-php-ext-install \
147147
bcmath \

0 commit comments

Comments
 (0)