Cadoles/fdroid-repository
21
0
Fork 0
Code Issues Pull Requests 1 Actions Projects Releases Wiki Activity

feat: upgrade to latest alpine 3.19 and fdroid 2.2

Browse Source
This commit is contained in:
wpetit
2024-04-29 19:13:08 +02:00
parent aa50e74d9a
commit b49a7ea957
8 changed files with 434 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Dockerfile
View File

@ -1,42 +1,52 @@
FROM alpine:3.9
FROM reg.cadoles.com/proxy_cache/library/alpine:3.19 as build
ARG HTTP_PROXY=
ARG HTTPS_PROXY=
ARG http_proxy=
ARG https_proxy=
ARG FDROIDSERVER_VERSION=1.0.10
ARG TIMEZONE=Europe/Paris
ARG FDROIDSERVER_VERSION=2.2
ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
RUN apk add --no-cache \
python3 build-base freetype-dev libffi-dev \
python3 py3-pip build-base freetype-dev libffi-dev \
libpng-dev py3-setuptools python3-dev libxml2-dev \
libxslt-dev openssl-dev jpeg-dev java-common \
libxslt-dev openssl-dev jpeg-dev py3-qt5
RUN python3 -m venv --system-site-packages /fdroid
RUN . /fdroid/bin/activate \
&& pip3 install --no-cache-dir androguard==3.3.5 frida-tools==10.8.0 fdroidserver==${FDROIDSERVER_VERSION}
FROM reg.cadoles.com/proxy_cache/library/alpine:3.19 as runtime
ARG TIMEZONE=Europe/Paris
RUN apk add --no-cache \
python3 openjdk8 java-common \
bash supervisor openssh inotify-tools gettext \
openjdk8 fastjar caddy tzdata
fastjar caddy tzdata git wget gcompat rsync
RUN cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
&& echo "${TIMEZONE}" > /etc/timezone \
&& apk del tzdata
RUN ln -s /usr/bin/fastjar /usr/bin/jar
RUN mkdir -p /opt/android \
&& wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && unzip *.zip -d /opt/android && rm *.zip
ENV ANDROID_HOME="/opt/android"
ENV PATH="$PATH:$ANDROID_HOME/tools/bin"
RUN yes | sdkmanager "build-tools;34.0.0"
ENV PATH="$PATH:$ANDROID_HOME/build-tools/34.0.0"
COPY --from=build /fdroid /fdroid
RUN rm -f /usr/bin/jar && ln -s /usr/bin/fastjar /usr/bin/jar
RUN ln -s /usr/include/libxml2 /usr/include/libxml
RUN pip3 install --upgrade pip
RUN pip3 install fdroidserver==${FDROIDSERVER_VERSION}
RUN apk del build-base
COPY supervisor.ini /etc/supervisor.d/supervisor.ini
COPY docker-entrypoint.sh /docker-entrypoint.sh
RUN chmod +x /docker-entrypoint.sh
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
RUN mkdir /fdroid
WORKDIR /fdroid
COPY config.py /fdroid/config.py.tmpl
COPY Caddyfile /fdroid/Caddyfile
COPY config.yml /fdroid/config.yml.tmpl
COPY fdroid-update.sh /fdroid/fdroid-update.sh
RUN chmod +x /fdroid/fdroid-update.sh
@ -44,21 +54,23 @@ RUN chmod +x /fdroid/fdroid-update.sh
COPY fdroid-icon.png /fdroid/fdroid-icon.png
VOLUME /fdroid/repo
VOLUME /fdroid/archive
VOLUME /fdroid/metadata
VOLUME /fdroid/keystore
EXPOSE 2222
EXPOSE 80
EXPOSE 443
ENV FDROID_ARCHIVE_OLDER=3
ENV FDROID_REPO_ICON=fdroid-icon.png
ENV FDROID_ARCHIVE_ICON=fdroid-icon.png
RUN sed -i "s/^#HostKey.*$/HostKey \/fdroid\/ssh_host_rsa_key/" /etc/ssh/sshd_config
RUN sed -i "s/^#HostKey.*$/HostKey \/fdroid\/host_ssh\/ssh_host_rsa_key/" /etc/ssh/sshd_config
RUN sed -i "s/^#Port.*$/Port 2222/" /etc/ssh/sshd_config
RUN addgroup -S fdroid && adduser -D -h /fdroid -s /bin/bash -G fdroid fdroid
RUN chown -R fdroid: /fdroid
RUN mkdir -p /var/www/fdroid
CMD /docker-entrypoint.sh
RUN addgroup -S fdroid && adduser -D -h /fdroid -s /bin/bash -G fdroid fdroid
RUN chown -R fdroid: /fdroid /var/www/fdroid
CMD /usr/local/bin/docker-entrypoint.sh