Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debian 12 migration #599

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:11
image: postgres:15
env:
POSTGRES_USER: exodus
POSTGRES_PASSWORD: exodus
Expand All @@ -34,8 +34,8 @@ jobs:
strategy:
matrix:
python-version:
- "3.9"
- "3.10"
- "3.11"
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exodus-core = "==1.3.10"
google-play-scraper = "~=1.2.2"
gunicorn = "~=20.1"
mistune = "~=0.8"
psycopg2 = "~=2.8.6"
psycopg2 = "~=2.9.9"
requests = "~=2.27"
protobuf = "~=3.20.1"
whitenoise = "~=6.2.0"
Expand Down
32 changes: 15 additions & 17 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3"
services:

amqp:
image: rabbitmq:3.8.9-alpine
image: rabbitmq:3.10.8-alpine
networks:
backend:
aliases:
Expand All @@ -16,7 +16,7 @@ services:
POSTGRES_PASSWORD: exodus
POSTGRES_DB: exodus
PGDATA: /var/lib/postgresql/data/pgdata
image: postgres:11
image: postgres:15
restart: always
networks:
backend:
Expand Down Expand Up @@ -70,7 +70,7 @@ services:
environment:
MINIO_ROOT_USER: exodusexodus
MINIO_ROOT_PASSWORD: exodusexodus
image: minio/minio:RELEASE.2022-03-14T18-25-24Z
image: minio/minio:RELEASE.2024-01-05T22-17-24Z
networks:
backend:
aliases:
Expand Down
52 changes: 42 additions & 10 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,58 @@
FROM alpine:3.18 AS apkeep-download
FROM rust:1.75.0-slim-bookworm AS apkeep-build

ENV APKEEP_VERSION=0.15.0
ENV OPENSSL_VERSION=1.1.1w

RUN wget https://github.com/EFForg/apkeep/releases/download/${APKEEP_VERSION}/apkeep-x86_64-unknown-linux-gnu -q -O /tmp/apkeep \
&& chmod +x /tmp/apkeep
# Workaround to build Apkeep (see https://github.com/Exodus-Privacy/exodus/issues/598)

FROM python:3.9-slim-bullseye
RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential=12.* \
ca-certificates=202* \
curl=7.* \
pkg-config=1.* \
wget=1.* \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

## Build OpenSSL

RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -q -O /tmp/openssl-${OPENSSL_VERSION}.tar.gz \
&& tar xfvz /tmp/openssl-${OPENSSL_VERSION}.tar.gz --directory /tmp/
WORKDIR /tmp/openssl-${OPENSSL_VERSION}/
RUN ./config --prefix=/opt/openssl --openssldir=/opt/openssl \
&& make \
&& make test \
&& make install_sw

## Build Apkeep

RUN wget https://github.com/EFForg/apkeep/archive/refs/tags/${APKEEP_VERSION}.tar.gz -q -O /tmp/apkeep-${APKEEP_VERSION}.tar.gz \
&& tar -xzf /tmp/apkeep-${APKEEP_VERSION}.tar.gz -C /tmp/ \
&& rm /tmp/apkeep-${APKEEP_VERSION}.tar.gz
WORKDIR /tmp/apkeep-${APKEEP_VERSION}
RUN PATH=/opt/openssl/bin:$PATH LD_LIBRARY_PATH=/opt/openssl/lib OPENSSL_STATIC=1 OPENSSL_INCLUDE_DIR=/opt/openssl/include/ OPENSSL_LIB_DIR=/opt/openssl/lib/ OPENSSL_DIR=/opt/openssl/ cargo build --release \
&& chmod +x target/release/apkeep \
&& mv target/release/apkeep /opt/apkeep

FROM python:3.11-slim-bookworm
LABEL maintainer="Codimp"

RUN apt-get update && apt-get install --no-install-recommends -y \
dexdump=10.0.0* \
postgresql-client-13=13* \
libpq-dev=13.* \
gcc=4:10.2.* \
dexdump=11.0.0* \
postgresql-client-15=15* \
libpq-dev=15.* \
gcc=4:12.2.* \
musl-dev=1.2.* \
libc6-dev=2.* \
gettext=0.* \
pipenv=11.* \
pipenv=2022.12.* \
libssl3=3.* \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY --from=apkeep-download /tmp/apkeep /usr/local/bin/apkeep
COPY --from=apkeep-build /opt/openssl /opt/openssl
COPY --from=apkeep-build /opt/apkeep /usr/local/bin/apkeep
RUN ln -s /usr/lib/ssl/certs /opt/openssl/certs

WORKDIR /opt

Expand Down
Loading