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

Switch base images to slim-bullseye #28

Merged
merged 1 commit into from
May 10, 2023
Merged
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
15 changes: 10 additions & 5 deletions mailbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
FROM pypy:3.9-7.3.9-bullseye
FROM pypy:3.9-7.3.9-slim-bullseye

RUN apt-get update && apt-get install -y \
rustc \
&& rm -rf /var/lib/apt/lists/*

VOLUME /db

COPY Pipfile /app/Pipfile
COPY Pipfile.lock /app/Pipfile.lock

RUN apt update
RUN apt install rustc -y

WORKDIR /app

ARG VERSION_TAG
RUN pip install git+https://github.com/magic-wormhole/magic-wormhole-mailbox-server.git@${VERSION_TAG}#egg=magic-wormhole-mailbox-server
RUN pip install \
--disable-pip-version-check \
--no-cache \
--upgrade \
https://github.com/magic-wormhole/magic-wormhole-mailbox-server/tarball/${VERSION_TAG}#egg=magic-wormhole-mailbox-server

# Copy welcome message as file to load with newlines symbols in parameters
COPY welcome.motd welcome.motd
Expand Down
15 changes: 10 additions & 5 deletions relay/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
FROM pypy:3.9-7.3.9-bullseye
FROM pypy:3.9-7.3.9-slim-bullseye

RUN apt-get update && apt-get install -y \
rustc \
&& rm -rf /var/lib/apt/lists/*

VOLUME /db

COPY Pipfile /app/Pipfile
COPY Pipfile.lock /app/Pipfile.lock

RUN apt update
RUN apt install rustc -y

WORKDIR /app

ARG VERSION_TAG
RUN pip install git+https://github.com/magic-wormhole/magic-wormhole-transit-relay.git@${VERSION_TAG}#egg=magic-wormhole-transit-relay
RUN pip install \
--disable-pip-version-check \
--no-cache \
--upgrade \
https://github.com/magic-wormhole/magic-wormhole-transit-relay/tarball/${VERSION_TAG}#egg=magic-wormhole-transit-relay

CMD twist transitrelay --usage-db=/db/usage-transitrelay.sqlite --blur-usage 3600 --port=tcp:4001 --websocket=tcp:4002