diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 899d1a9..7ff5d17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: run: echo "THEMIX_GUI_PATH=./themix_gui/" >> $GITHUB_ENV - name: move dockerfiles into build context - run: mv ./dockerfiles/* ./ + run: mv ./themix_gui/dockerfiles/* ./ - name: switch base docker image run: sed -i -e 's|FROM archlinux:base-devel|FROM actionless/pikaur|' Dockerfile_${PYVER} diff --git a/dockerfiles/Dockerfile_current_arch b/dockerfiles/Dockerfile_current_arch deleted file mode 100644 index dbf765a..0000000 --- a/dockerfiles/Dockerfile_current_arch +++ /dev/null @@ -1,17 +0,0 @@ -FROM archlinux:base-devel -WORKDIR /opt/oomox-build/ - -# App and test (xvfb, pylint) deps -RUN pacman -Syu --noconfirm && \ - pacman -S --needed --noconfirm gtk3 python-gobject python-yaml flake8 python-pylint xorg-server-xvfb mypy python-typing_extensions shellcheck && \ - pacman -S --needed --noconfirm git base-devel && \ - (useradd -m user && echo "user ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers || true) && \ - (which pikaur || sudo -u user bash -c "\ - git clone https://aur.archlinux.org/pikaur /home/user/pikaur && \ - cd /home/user/pikaur && \ - makepkg --install --syncdeps --noconfirm") && \ - sudo -u user pikaur -S --needed --noconfirm python-pystache vulture - -COPY . /opt/oomox-build/ - -# vim: set ft=dockerfile : diff --git a/dockerfiles/Dockerfile_python36_ubuntu_1804 b/dockerfiles/Dockerfile_python36_ubuntu_1804 deleted file mode 100644 index fb9cc7f..0000000 --- a/dockerfiles/Dockerfile_python36_ubuntu_1804 +++ /dev/null @@ -1,12 +0,0 @@ -FROM library/ubuntu:bionic -WORKDIR /opt/oomox-build/ - -# App and test (xvfb, pylint) deps -RUN apt-get update -y && \ - env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gtk+3.0 python3-gi xvfb python3-pip psmisc python3-pystache python3-yaml -RUN pip3 install setuptools && \ - pip3 install pylint~=2.12 flake8 typing-extensions - -COPY . /opt/oomox-build/ - -# vim: set ft=dockerfile: diff --git a/dockerfiles/Dockerfile_python38_ubuntu_2004 b/dockerfiles/Dockerfile_python38_ubuntu_2004 deleted file mode 100644 index 272d73a..0000000 --- a/dockerfiles/Dockerfile_python38_ubuntu_2004 +++ /dev/null @@ -1,12 +0,0 @@ -FROM library/ubuntu:focal -WORKDIR /opt/oomox-build/ - -# App and test (xvfb, pylint) deps -RUN apt-get update -y && \ - env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gtk+3.0 python3-gi xvfb python3-pip psmisc python3-pystache python3-yaml -RUN pip3 install setuptools && \ - pip3 install pylint~=2.12 flake8 typing-extensions - -COPY . /opt/oomox-build/ - -# vim: set ft=dockerfile: