Skip to content

Commit 091beb1

Browse files
committed
Update debian and fix dependencies
1 parent 3907b18 commit 091beb1

2 files changed

Lines changed: 15 additions & 16 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.idea/

Dockerfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
FROM debian:buster
1+
FROM debian:trixie
22

33
LABEL tag="ackee-gitlab" \
44
author="Ackee 🦄" \
55
description="This Docker image serves as an environment for running Android builds on Gitlab CI in Ackee workspace"
66

77
SHELL ["/bin/bash", "-c"]
88

9-
RUN apt-get update && apt-get install -y \
9+
RUN apt update && apt install -y \
1010
curl \
1111
git \
12-
libgl1-mesa-glx \
12+
libgl1 \
1313
unzip \
1414
zip \
15-
python \
15+
python3 \
1616
wget \
17-
fontconfig
17+
xz-utils \
18+
fontconfig \
19+
apt-transport-https \
20+
ca-certificates \
21+
gnupg
1822

1923
RUN curl -s "https://get.sdkman.io" | bash && \
2024
source "$HOME/.sdkman/bin/sdkman-init.sh" && \
@@ -44,17 +48,11 @@ RUN sdkmanager $(sdkmanager --list 2> /dev/null | grep platforms | awk -F' ' '{p
4448
# list all build-tools, sort them in descending order and install them
4549
RUN sdkmanager $(sdkmanager --list 2> /dev/null | grep build-tools | awk -F' ' '{print $1}' | sort -nr -k2 -t \; | uniq)
4650

47-
# install gcloud
48-
RUN wget -q https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-334.0.0-linux-x86_64.tar.gz -O g.tar.gz && \
49-
tar xf g.tar.gz && \
50-
rm g.tar.gz && \
51-
mv google-cloud-sdk /opt/google-cloud-sdk && \
52-
/opt/google-cloud-sdk/install.sh -q && \
53-
/opt/google-cloud-sdk/bin/gcloud config set component_manager/disable_update_check true
54-
# add gcloud SDK to path
55-
ENV PATH="${PATH}:/opt/google-cloud-sdk/bin/"
56-
57-
## Danger-kotlin dependencies
51+
# setup gcloud
52+
RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk main" >> /etc/apt/sources.list.d/google-cloud-sdk.list && \
53+
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor >> /etc/apt/trusted.gpg.d/cloud.google.gpg && \
54+
apt-get update && apt-get install -y google-cloud-cli && \
55+
gcloud config set component_manager/disable_update_check true
5856

5957
# nvm environment variables
6058
ENV NVM_DIR=/usr/local/nvm \

0 commit comments

Comments
 (0)