chatterino2
Code Issues

Fix AppImage not containing all SSL dependencies (#4400)

Browse Source 
This means the AppImage is built on Ubuntu 20.04 using Qt 5.12
This commit is contained in:
pajlada
2023-02-21 09:47:18 +01:00
committed by GitHub
parent 621b5d9163
commit 7e005ba661
6 changed files with 66 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.docker/Dockerfile-ubuntu-20.04-package
+13 -5
View File
@@ -1,13 +1,21 @@
FROM chatterino-ubuntu-20.04-build
ADD .CI /src/.CI
# In CI, this is set from the aqtinstall action
ENV Qt5_DIR=/opt/qt512
WORKDIR /src/build
# RUN apt-get install -y wget
ADD .CI /src/.CI
# create appimage
# RUN pwd && ./../.CI/CreateAppImage.sh
# Install dependencies necessary for AppImage packaging
RUN apt-get update && apt-get -y install --no-install-recommends \
curl \
libfontconfig \
libxrender1 \
file
# package deb
RUN pwd && ./../.CI/CreateUbuntuDeb.sh
RUN ./../.CI/CreateUbuntuDeb.sh
# package appimage
RUN ./../.CI/CreateAppImage.sh
.docker/Dockerfile-ubuntu-22.04-package
+14 -1
View File
@@ -1,8 +1,21 @@
FROM chatterino-ubuntu-22.04-build
ADD .CI /src/.CI
# In CI, this is set from the aqtinstall action
ENV Qt5_DIR=/opt/qt515
WORKDIR /src/build
ADD .CI /src/.CI
# Install dependencies necessary for AppImage packaging
RUN apt-get update && apt-get -y install --no-install-recommends \
curl \
libxcb-shape0 \
libfontconfig1 \
file
# package deb
RUN ./../.CI/CreateUbuntuDeb.sh
# package appimage
RUN ./../.CI/CreateAppImage.sh
.docker/README.md
+6 -4
View File
@@ -7,9 +7,9 @@
To build, from the repo root
1. Build a docker image that contains all the build artifacts and source from building Chatterino on Ubuntu 20.04
`docker build -t chatterino-ubuntu-20.04-build -f .docker/Dockerfile-ubuntu-20.04-build .`
`docker buildx build -t chatterino-ubuntu-20.04-build -f .docker/Dockerfile-ubuntu-20.04-build .`
1. Build a docker image that uses the above-built image & packages it into a .deb file
`docker build -t chatterino-ubuntu-20.04-package -f .docker/Dockerfile-ubuntu-20.04-package .`
`docker buildx build -t chatterino-ubuntu-20.04-package -f .docker/Dockerfile-ubuntu-20.04-package .`
To extract the final package, you can run the following command:
`docker run -v $PWD:/opt/mount --rm -it chatterino-ubuntu-20.04-package bash -c "cp /src/build/Chatterino-x86_64.deb /opt/mount/"`
@@ -21,9 +21,11 @@ To extract the final package, you can run the following command:
To build, from the repo root
1. Build a docker image that contains all the build artifacts and source from building Chatterino on Ubuntu 22.04
`docker build -t chatterino-ubuntu-22.04-build -f .docker/Dockerfile-ubuntu-22.04-build .`
`docker buildx build -t chatterino-ubuntu-22.04-build -f .docker/Dockerfile-ubuntu-22.04-build .`
1. Build a docker image that uses the above-built image & packages it into a .deb file
`docker build -t chatterino-ubuntu-22.04-package -f .docker/Dockerfile-ubuntu-22.04-package .`
`docker buildx build -t chatterino-ubuntu-22.04-package -f .docker/Dockerfile-ubuntu-22.04-package .`
To extract the final package, you can run the following command:
`docker run -v $PWD:/opt/mount --rm -it chatterino-ubuntu-22.04-package bash -c "cp /src/build/Chatterino-x86_64.deb /opt/mount/"`
NOTE: The AppImage from Ubuntu 22.04 is broken. Approach with caution