Skip to content

Commit df28143

Browse files
committed
Update packages. Enable arm64 builds
Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
1 parent 57427bf commit df28143

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/containers.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
tags:
88
- 'v*'
99
workflow_dispatch: # allow to manually trigger this workflow
10+
pull_request:
1011

1112
env:
1213
REGISTRY: ghcr.io
@@ -105,7 +106,7 @@ jobs:
105106
with:
106107
file: ci/Dockerfile
107108
context: .
108-
platforms: linux/amd64
109+
platforms: linux/amd64,linux/arm64
109110
push: true
110111
tags: ${{ steps.meta.outputs.tags }}
111112
labels: ${{ steps.meta.outputs.labels }}

ci/Dockerfile

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM almalinux:9.3-minimal
1+
FROM almalinux:9.4-minimal
22

33
LABEL maintainer="appthreat" \
44
org.opencontainers.image.authors="Team AppThreat <cloud@appthreat.com>" \
@@ -54,11 +54,10 @@ RUN set -e; \
5454
;; \
5555
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
5656
esac; \
57-
echo -e "[nodejs]\nname=nodejs\nstream=20\nprofiles=\nstate=enabled\n" > /etc/dnf/modules.d/nodejs.module \
58-
&& microdnf install -y gcc git-core php php-cli php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make wget bash graphviz graphviz-gd \
57+
microdnf install -y gcc git-core php php-cli php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make wget bash graphviz graphviz-gd \
5958
pcre2 findutils which tar gzip zip unzip sudo nodejs ncurses sqlite-devel glibc-common glibc-all-langpacks \
6059
&& mkdir -p /opt/miniconda3 /opt/workspace \
61-
&& wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /opt/miniconda3/miniconda.sh \
60+
&& wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-${ARCH_NAME}.sh -O /opt/miniconda3/miniconda.sh \
6261
&& bash /opt/miniconda3/miniconda.sh -b -u -p /opt/miniconda3 \
6362
&& rm -rf /opt/miniconda3/miniconda.sh \
6463
&& ln -s /opt/miniconda3/etc/profile.d/conda.sh /etc/profile.d/conda.sh \
@@ -69,9 +68,9 @@ RUN set -e; \
6968
&& conda config --set solver libmamba \
7069
&& conda init bash \
7170
&& bash -c /opt/conda-install.sh \
72-
&& curl -LO https://repo.almalinux.org/almalinux/9/CRB/${ARCH_NAME}/os/Packages/graphviz-devel-2.44.0-25.el9.${ARCH_NAME}.rpm \
73-
&& rpm -ivh graphviz-devel-2.44.0-25.el9.${ARCH_NAME}.rpm \
74-
&& rm graphviz-devel-2.44.0-25.el9.${ARCH_NAME}.rpm \
71+
&& curl -LO https://repo.almalinux.org/almalinux/9/CRB/${ARCH_NAME}/os/Packages/graphviz-devel-2.44.0-26.el9.${ARCH_NAME}.rpm \
72+
&& rpm -ivh graphviz-devel-2.44.0-26.el9.${ARCH_NAME}.rpm \
73+
&& rm graphviz-devel-2.44.0-26.el9.${ARCH_NAME}.rpm \
7574
&& curl -s "https://get.sdkman.io" | bash \
7675
&& source "$HOME/.sdkman/bin/sdkman-init.sh" \
7776
&& echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" >> $HOME/.sdkman/etc/config \
@@ -83,14 +82,14 @@ RUN set -e; \
8382
&& rm -rf /root/.sdkman \
8483
&& microdnf install -y epel-release \
8584
&& mkdir -p ${ANDROID_HOME}/cmdline-tools \
86-
&& curl -L https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o ${ANDROID_HOME}/cmdline-tools/android_tools.zip \
85+
&& curl -L https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o ${ANDROID_HOME}/cmdline-tools/android_tools.zip \
8786
&& unzip ${ANDROID_HOME}/cmdline-tools/android_tools.zip -d ${ANDROID_HOME}/cmdline-tools/ \
8887
&& rm ${ANDROID_HOME}/cmdline-tools/android_tools.zip \
8988
&& mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
9089
&& yes | /opt/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses --sdk_root=/opt/android-sdk-linux \
9190
&& /opt/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager 'platform-tools' --sdk_root=/opt/android-sdk-linux \
92-
&& /opt/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager 'platforms;android-33' --sdk_root=/opt/android-sdk-linux \
93-
&& /opt/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager 'build-tools;33.0.0' --sdk_root=/opt/android-sdk-linux \
91+
&& /opt/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager 'platforms;android-34' --sdk_root=/opt/android-sdk-linux \
92+
&& /opt/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager 'build-tools;34.0.0' --sdk_root=/opt/android-sdk-linux \
9493
&& sudo npm install -g @appthreat/atom @cyclonedx/cdxgen --omit=optional \
9594
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && php composer-setup.php \
9695
&& mv composer.phar /usr/local/bin/composer

0 commit comments

Comments
 (0)