Delete unused .docker directory (#5906)
This commit is contained in:
Wissididom
@@ -1,40 +0,0 @@
|
|||||||
FROM ubuntu:20.04
|
|
||||||
|
|
||||||
ENV TZ=UTC
|
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install --no-install-recommends \
|
|
||||||
cmake \
|
|
||||||
virtualenv \
|
|
||||||
rapidjson-dev \
|
|
||||||
libfuse2 \
|
|
||||||
libssl-dev \
|
|
||||||
libboost-dev \
|
|
||||||
libxcb-randr0-dev \
|
|
||||||
libboost-system-dev \
|
|
||||||
libboost-filesystem-dev \
|
|
||||||
libnotify4 \
|
|
||||||
libnotify-dev \
|
|
||||||
libpulse-dev \
|
|
||||||
libxkbcommon-x11-0 \
|
|
||||||
build-essential \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libxcb-icccm4 \
|
|
||||||
libxcb-image0 \
|
|
||||||
libxcb-keysyms1 \
|
|
||||||
libxcb-render-util0 \
|
|
||||||
libxcb-xinerama0
|
|
||||||
|
|
||||||
RUN apt-get -y install \
|
|
||||||
git \
|
|
||||||
lsb-release \
|
|
||||||
python3-pip && \
|
|
||||||
apt-get clean all
|
|
||||||
|
|
||||||
# Install Qt as we do in CI
|
|
||||||
|
|
||||||
RUN pip3 install -U pip && \
|
|
||||||
pip3 install aqtinstall && \
|
|
||||||
aqt install-qt linux desktop 5.12.12 && \
|
|
||||||
mkdir -p /opt/qt512 && \
|
|
||||||
mv /5.12.12/gcc_64/* /opt/qt512
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
FROM chatterino-ubuntu-20.04-base
|
|
||||||
|
|
||||||
ADD . /src
|
|
||||||
|
|
||||||
RUN mkdir /src/build
|
|
||||||
|
|
||||||
# cmake
|
|
||||||
RUN cd /src/build && \
|
|
||||||
CXXFLAGS=-fno-sized-deallocation cmake \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=appdir/usr/ \
|
|
||||||
-DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake \
|
|
||||||
-DBUILD_WITH_QTKEYCHAIN=OFF \
|
|
||||||
..
|
|
||||||
|
|
||||||
# build
|
|
||||||
RUN cd /src/build && \
|
|
||||||
make -j8
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
FROM chatterino-ubuntu-20.04-build
|
|
||||||
|
|
||||||
# In CI, this is set from the aqtinstall action
|
|
||||||
ENV Qt5_DIR=/opt/qt512
|
|
||||||
|
|
||||||
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 \
|
|
||||||
libfontconfig \
|
|
||||||
libxrender1 \
|
|
||||||
file
|
|
||||||
|
|
||||||
# package deb
|
|
||||||
RUN ./../.CI/CreateUbuntuDeb.sh
|
|
||||||
|
|
||||||
# package appimage
|
|
||||||
RUN ./../.CI/CreateAppImage.sh
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ENV TZ=UTC
|
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install --no-install-recommends \
|
|
||||||
cmake \
|
|
||||||
virtualenv \
|
|
||||||
rapidjson-dev \
|
|
||||||
libfuse2 \
|
|
||||||
libssl-dev \
|
|
||||||
libboost-dev \
|
|
||||||
libxcb-randr0-dev \
|
|
||||||
libboost-system-dev \
|
|
||||||
libboost-filesystem-dev \
|
|
||||||
libnotify4 \
|
|
||||||
libnotify-dev \
|
|
||||||
libpulse-dev \
|
|
||||||
libxkbcommon-x11-0 \
|
|
||||||
build-essential \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libxcb-icccm4 \
|
|
||||||
libxcb-image0 \
|
|
||||||
libxcb-keysyms1 \
|
|
||||||
libxcb-render-util0 \
|
|
||||||
libxcb-xinerama0 \
|
|
||||||
libfontconfig
|
|
||||||
|
|
||||||
RUN apt-get -y install \
|
|
||||||
git \
|
|
||||||
lsb-release \
|
|
||||||
python3-pip && \
|
|
||||||
apt-get clean all
|
|
||||||
|
|
||||||
# Install Qt as we do in CI
|
|
||||||
|
|
||||||
RUN pip3 install -U pip && \
|
|
||||||
pip3 install aqtinstall && \
|
|
||||||
aqt install-qt linux desktop 5.15.2 && \
|
|
||||||
mkdir -p /opt/qt515 && \
|
|
||||||
mv /5.15.2/gcc_64/* /opt/qt515
|
|
||||||
|
|
||||||
ADD ./.patches /tmp/.patches
|
|
||||||
|
|
||||||
# Apply Qt patches
|
|
||||||
RUN patch "/opt/qt515/include/QtConcurrent/qtconcurrentthreadengine.h" /tmp/.patches/qt5-on-newer-gcc.patch
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
FROM chatterino-ubuntu-22.04-base
|
|
||||||
|
|
||||||
ADD . /src
|
|
||||||
|
|
||||||
RUN mkdir /src/build
|
|
||||||
|
|
||||||
# cmake
|
|
||||||
RUN cd /src/build && \
|
|
||||||
CXXFLAGS=-fno-sized-deallocation cmake \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=appdir/usr/ \
|
|
||||||
-DCMAKE_PREFIX_PATH=/opt/qt515/lib/cmake \
|
|
||||||
-DBUILD_WITH_QTKEYCHAIN=OFF \
|
|
||||||
..
|
|
||||||
|
|
||||||
# build
|
|
||||||
RUN cd /src/build && \
|
|
||||||
make -j8
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
FROM chatterino-ubuntu-22.04-build
|
|
||||||
|
|
||||||
# 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
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
ARG UBUNTU_VERSION=22.04
|
|
||||||
|
|
||||||
FROM ubuntu:$UBUNTU_VERSION
|
|
||||||
|
|
||||||
ARG QT_VERSION=6.2.4
|
|
||||||
|
|
||||||
ENV TZ=UTC
|
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install --no-install-recommends \
|
|
||||||
cmake \
|
|
||||||
virtualenv \
|
|
||||||
rapidjson-dev \
|
|
||||||
libfuse2 \
|
|
||||||
libssl-dev \
|
|
||||||
libboost-dev \
|
|
||||||
libxcb-randr0-dev \
|
|
||||||
libboost-system-dev \
|
|
||||||
libboost-filesystem-dev \
|
|
||||||
libnotify4 \
|
|
||||||
libnotify-dev \
|
|
||||||
libpulse-dev \
|
|
||||||
libxkbcommon-x11-0 \
|
|
||||||
build-essential \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libxcb-icccm4 \
|
|
||||||
libxcb-image0 \
|
|
||||||
libxcb-keysyms1 \
|
|
||||||
libxcb-render-util0 \
|
|
||||||
libxcb-xinerama0 \
|
|
||||||
libfontconfig1-dev
|
|
||||||
|
|
||||||
RUN apt-get -y install \
|
|
||||||
git \
|
|
||||||
lsb-release \
|
|
||||||
python3-pip && \
|
|
||||||
apt-get clean all
|
|
||||||
|
|
||||||
# Install Qt as we do in CI
|
|
||||||
|
|
||||||
RUN pip3 install -U pip && \
|
|
||||||
pip3 install aqtinstall && \
|
|
||||||
aqt install-qt linux desktop $QT_VERSION -O /opt/qt --modules qt5compat
|
|
||||||
|
|
||||||
ADD . /src
|
|
||||||
|
|
||||||
RUN mkdir /src/build
|
|
||||||
|
|
||||||
# cmake
|
|
||||||
RUN cd /src/build && \
|
|
||||||
CXXFLAGS=-fno-sized-deallocation cmake \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=appdir/usr/ \
|
|
||||||
-DCMAKE_PREFIX_PATH=/opt/qt/$QT_VERSION/gcc_64/lib/cmake \
|
|
||||||
-DBUILD_WITH_QTKEYCHAIN=OFF \
|
|
||||||
..
|
|
||||||
|
|
||||||
# build
|
|
||||||
RUN cd /src/build && \
|
|
||||||
make -j8
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
ARG UBUNTU_VERSION=22.04
|
|
||||||
|
|
||||||
FROM chatterino-ubuntu-$UBUNTU_VERSION-qt6-build
|
|
||||||
|
|
||||||
# In CI, this is set from the aqtinstall action
|
|
||||||
ENV Qt6_DIR=/opt/qt/6.2.4/gcc_64
|
|
||||||
|
|
||||||
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
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
FROM chatterino-ubuntu-22.04-base
|
|
||||||
|
|
||||||
ADD . /src
|
|
||||||
|
|
||||||
RUN mkdir /src/build
|
|
||||||
|
|
||||||
# cmake
|
|
||||||
RUN cd /src/build && \
|
|
||||||
CXXFLAGS=-fno-sized-deallocation cmake \
|
|
||||||
-DCMAKE_PREFIX_PATH=/opt/qt515/lib/cmake \
|
|
||||||
-DUSE_PRECOMPILED_HEADERS=OFF \
|
|
||||||
-DBUILD_WITH_QTKEYCHAIN=OFF \
|
|
||||||
-DBUILD_TESTS=ON \
|
|
||||||
..
|
|
||||||
|
|
||||||
# build
|
|
||||||
RUN cd /src/build && \
|
|
||||||
make -j8
|
|
||||||
|
|
||||||
ENV QT_QPA_PLATFORM=minimal
|
|
||||||
ENV QT_PLUGIN_PATH=/opt/qt515/plugins
|
|
||||||
|
|
||||||
# test
|
|
||||||
CMD /src/build/bin/chatterino-test
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
## Groups
|
|
||||||
|
|
||||||
### Ubuntu 20.04 package
|
|
||||||
|
|
||||||
`Dockerfile-ubuntu-20.04-package` relies on `Dockerfile-ubuntu-20.04-build`
|
|
||||||
|
|
||||||
To build, from the repo root
|
|
||||||
|
|
||||||
1. Build a docker image that contains all the dependencies necessary to build Chatterino on Ubuntu 20.04
|
|
||||||
`docker buildx build -t chatterino-ubuntu-20.04-base -f .docker/Dockerfile-ubuntu-20.04-base .`
|
|
||||||
1. Build a docker image that contains all the build artifacts and source from building Chatterino on Ubuntu 20.04
|
|
||||||
`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 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/"`
|
|
||||||
|
|
||||||
### Ubuntu 22.04 package
|
|
||||||
|
|
||||||
`Dockerfile-ubuntu-22.04-package` relies on `Dockerfile-ubuntu-22.04-build`
|
|
||||||
|
|
||||||
To build, from the repo root
|
|
||||||
|
|
||||||
1. Build a docker image that contains all the dependencies necessary to build Chatterino on Ubuntu 22.04
|
|
||||||
`docker buildx build -t chatterino-ubuntu-22.04-base -f .docker/Dockerfile-ubuntu-22.04-base .`
|
|
||||||
1. Build a docker image that contains all the build artifacts and source from building Chatterino on Ubuntu 22.04
|
|
||||||
`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 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
|
|
||||||
|
|
||||||
#### Testing
|
|
||||||
|
|
||||||
1. Build a docker image builds the Chatterino tests
|
|
||||||
`docker buildx build -t chatterino-ubuntu-22.04-test -f .docker/Dockerfile-ubuntu-22.04-test .`
|
|
||||||
1. Run the tests
|
|
||||||
`docker run --rm --network=host chatterino-ubuntu-22.04-test`
|
|
||||||
Reference in New Issue
Block a user