summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi92@disroot.org>2025-11-22 23:04:09 +0100
committerXavier Del Campo Romero <xavi92@disroot.org>2026-01-09 21:33:25 +0100
commit7e4105c54294e28d4cf2ec94c8746ed47e7ae532 (patch)
tree07309b502c179d5cf627c3bf48fea070d4372442
parent7dfb196b54da0e4aaa3119a6bd6ffd54fa404ce6 (diff)
downloadwasted-appimage-oci-7e4105c54294e28d4cf2ec94c8746ed47e7ae532.tar.gz
Use appimage-builder fork
The upstream version distributed by pip3 fetches several blobs from github.com we have no control over. Instead, the fork retrieves them from repositories under the speed-dreams organization. [1][2] [1]: https://forge.a-lec.org/speed-dreams/AppImageKit [2]: https://forge.a-lec.org/speed-dreams/libappimage
-rw-r--r--AppImageBuilder.yml76
-rw-r--r--Dockerfile13
2 files changed, 10 insertions, 79 deletions
diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
deleted file mode 100644
index 711cc35..0000000
--- a/AppImageBuilder.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
-version: 1
-AppDir:
- path: /AppDir
- app_info:
- id: speed-dreams
- name: speed-dreams
- icon: icon
- version: latest
- exec: usr/games/speed-dreams-2
- exec_args: $@
- apt:
- arch:
- - amd64
- allow_unauthenticated: true
- sources:
- - sourceline: deb [signed-by="/usr/share/keyrings/ubuntu-archive-keyring.gpg"]
- http://archive.ubuntu.com/ubuntu focal main universe
- - sourceline: deb [signed-by="/usr/share/keyrings/ubuntu-archive-keyring.gpg"]
- http://archive.ubuntu.com/ubuntu focal-updates main universe
- - sourceline: deb [signed-by="/usr/share/keyrings/ubuntu-archive-keyring.gpg"]
- http://security.ubuntu.com/ubuntu focal-security main universe
- include:
- - libc6:amd64
- - locales
- - libenet7
- - libexpat1
- - libglu1-mesa
- - libglx0
- - libopengl0
- - libopenscenegraph160
- - libcurl4
- - libsdl2-2.0-0
- - libsdl2-mixer-2.0-0
- - librhash0
- - libenet7
- - libpng16-16
- - libjpeg8
- - zlib1g
- - libminizip1
- - libopenal1
- - libplib1
- - bash
- - dash
- - perl
- files:
- include:
- - lib64/ld-linux-x86-64.so.2
- - usr/share/games/speed-dreams-2/*
- - usr/lib/games/speed-dreams-2/*
- - /usr/local/lib/libcjson.so*
- exclude:
- - usr/share/man
- - usr/share/doc/*/README.*
- - usr/share/doc/*/changelog.*
- - usr/share/doc/*/NEWS.*
- - usr/share/doc/*/TODO.*
- test:
- fedora-30:
- image: appimagecrafters/tests-env:fedora-30
- command: ./AppRun
- debian-stable:
- image: appimagecrafters/tests-env:debian-stable
- command: ./AppRun
- archlinux-latest:
- image: appimagecrafters/tests-env:archlinux-latest
- command: ./AppRun
- centos-7:
- image: appimagecrafters/tests-env:centos-7
- command: ./AppRun
- ubuntu-xenial:
- image: appimagecrafters/tests-env:ubuntu-xenial
- command: ./AppRun
-AppImage:
- arch: x86_64
- update-information: guess
diff --git a/Dockerfile b/Dockerfile
index 995270a..43c7717 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,11 +44,20 @@ RUN cmake -B build
RUN cmake --build build/ -j$(nproc)
RUN cmake --install build/
+FROM forge.a-lec.org/speed-dreams/ubuntu:focal AS appimage-builder
+COPY --from=python /usr/local/ /usr/local/
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
+ git
+RUN git clone https://forge.a-lec.org/speed-dreams/appimage-builder
+WORKDIR appimage-builder
+RUN pip3 install .
+
FROM forge.a-lec.org/speed-dreams/ubuntu:focal AS tools
COPY --from=python /usr/local/ /usr/local/
COPY --from=cmake /usr/local/ /usr/local/
COPY --from=cjson /usr/local/ /usr/local/
-RUN pip3 install appimage-builder
+COPY --from=appimage-builder /usr/local/ /usr/local/
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
fakeroot \
@@ -92,6 +101,4 @@ RUN git clone https://forge.a-lec.org/speed-dreams/forgejo-clone.git
FROM tools
COPY --from=upload-artifact upload-artifact/upload-artifact /usr/local/bin/
COPY --from=forgejo-clone forgejo-clone/forgejo-clone /usr/local/bin/
-COPY AppImageBuilder.yml /AppImageBuilder.yml
-COPY package.py /usr/local/lib/python3.10/site-packages/appimagebuilder/modules/deploy/apt/package.py
ENTRYPOINT ["/bin/bash"]