Skip to content

pushflatpak: split dev and runtime dependencies #1398

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.

Sign up for GitHub

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

Merged
jcristau merged 1 commit into from
Mar 20, 2026
+23 −11
Merged

pushflatpak: split dev and runtime dependencies #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pushflatpakscript/docker.d/image_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
set -o errexit -o pipefail

apt-get update
apt-get install --no-install-recommends -y curl gir1.2-ostree-1.0 libgirepository-2.0-dev ostree gcc libcairo2-dev
apt-get install --no-install-recommends -y gir1.2-ostree-1.0 libgirepository-2.0-0 ostree
apt-get clean
32 changes: 22 additions & 10 deletions taskcluster/docker/pushflatpakscript/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,37 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

FROM $DOCKER_IMAGE_PARENT

# %include pushflatpakscript
ADD --chown=app:app topsrcdir/pushflatpakscript /app/pushflatpakscript
FROM $DOCKER_IMAGE_PARENT AS flat_manager

USER root
RUN /app/pushflatpakscript/docker.d/image_setup.sh
RUN apt-get update && apt-get install --no-install-recommends -y curl gcc pkg-config libgirepository-2.0-dev libcairo2-dev

USER app

RUN cp -R /app/pushflatpakscript/docker.d/* /app/docker.d/ \
&& . /app/.venv/bin/activate \
&& uv sync --no-dev --active --frozen --package pushflatpakscript \
&& deactivate \
&& uv venv /app/flat_manager_venv \
RUN uv venv /app/flat_manager_venv \
&& . /app/flat_manager_venv/bin/activate \
&& uv sync --no-dev --active --frozen --package pushflatpakscript --only-group flat-manager \
&& curl -Ls \
https://github.com/flatpak/flat-manager/raw/100d44f761ba765552d2a799b5b7254b6a8b1e38/flat-manager-client | \
sed -e '1i#!/app/flat_manager_venv/bin/python' -e '1d' > /app/flat_manager_venv/bin/flat-manager-client \
&& chmod 755 /app/flat_manager_venv/bin/flat-manager-client \
&& echo "2e55c0d3797f948b5b2eb86b897d42ce318b829749a23b903d8a9ed7b3bcea59 /app/flat_manager_venv/bin/flat-manager-client" | sha256sum -c

FROM $DOCKER_IMAGE_PARENT

# %include pushflatpakscript
ADD --chown=app:app topsrcdir/pushflatpakscript /app/pushflatpakscript

USER root
RUN /app/pushflatpakscript/docker.d/image_setup.sh

USER app

RUN cp -R /app/pushflatpakscript/docker.d/* /app/docker.d/ \
&& . /app/.venv/bin/activate \
&& uv sync --no-dev --active --frozen --package pushflatpakscript

COPY --from=flat_manager /app/flat_manager_venv /app/flat_manager_venv

# Ensure flat-manager-client minimally works (e.g. no missing libs)
RUN /app/flat_manager_venv/bin/flat-manager-client --help