diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c4401e6..105702f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,7 +23,7 @@ jobs: continue-on-error: true strategy: matrix: - name: [suse-qt515, suse-qt68, fedora, devcontainer] + name: [suse-qt515, suse-qt68, fedora] steps: - name: Checkout Repository uses: actions/checkout@v4 diff --git a/README.md b/README.md index b0e78de..b8729c9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ Container Images for CI * **suse-qt515:** OpenSuSE with Qt 5.15 * **suse-qt68:** OpenSuSE with Qt 6.8 * **fedora:** Fedora Rawhide - * **devcontainer:** Arch Linux based image for Visual Studio Code The following images don't have the documentation inside, meaning they are not suitable to build Qt documentation such as Fluid API documentation: @@ -12,7 +11,6 @@ suitable to build Qt documentation such as Fluid API documentation: * suse-qt515 * suse-qt68 * fedora - * devcontainer ## Build diff --git a/devcontainer/Dockerfile b/devcontainer/Dockerfile deleted file mode 100644 index abf5dee..0000000 --- a/devcontainer/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -FROM archlinux:latest as base - -# Install packages -FROM base AS install -RUN echo -en "[kde-unstable]\nInclude = /etc/pacman.d/mirrorlist\n$(cat /etc/pacman.conf)\n" > /etc/pacman.conf && \ - sed -i '/\[testing\]/a [extra-testing]\nInclude = /etc/pacman.d/mirrorlist' /etc/pacman.conf -RUN pacman -Syu --noconfirm && \ - pacman -S --noconfirm \ - base-devel \ - git \ - clang \ - qt6-base \ - qt6-5compat \ - qt6-connectivity \ - qt6-declarative \ - qt6-doc \ - qt6-examples \ - qt6-imageformats \ - qt6-multimedia \ - qt6-quickeffectmaker \ - qt6-quicktimeline \ - qt6-svg \ - qt6-tools \ - qt6-wayland \ - polkit-qt6 \ - pkg-config \ - cmake \ - ninja \ - extra-cmake-modules \ - solid \ - networkmanager-qt \ - modemmanager-qt \ - libdrm \ - libinput \ - libxcvt \ - libdisplay-info \ - wayland-protocols - -# User variables -ARG USERNAME=liriuser -ARG USER_UID=1000 -ARG USER_GID=$USER_UID - -# Create the user -RUN groupadd --gid $USER_GID $USERNAME \ - && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \ - && pacman -Sy --noconfirm \ - && pacman -S --noconfirm sudo \ - && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ - && chmod 0440 /etc/sudoers.d/$USERNAME - -# Set the default user -USER $USERNAME diff --git a/devcontainer/Makefile b/devcontainer/Makefile deleted file mode 100644 index d728714..0000000 --- a/devcontainer/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -ORG=liridev -NAME=devcontainer -VERSION=latest - -DOCKER ?= docker - -build: - $(DOCKER) buildx build --no-cache-filter install -t $(ORG)/$(NAME):$(VERSION) . - -push: -ifeq ($(DOCKER),docker) - $(DOCKER) push $(ORG)/$(NAME):$(VERSION) -else - $(DOCKER) push $(ORG)/$(NAME):$(VERSION) docker://docker.io/$(ORG)/$(NAME):$(VERSION) -endif - -all: build - -clean: - $(DOCKER) rmi $(ORG)/$(NAME):$(VERSION) - -.PHONY: build