From 11256e7a29f64274a4aad6502bbc079bb0b01300 Mon Sep 17 00:00:00 2001
From: Mauro Ezequiel Moltrasio <mmoltras@redhat.com>
Date: Wed, 26 Jun 2024 10:46:54 +0200
Subject: [PATCH] Remove os-uni devcontainer

Done with the course, so no need to keep it around.
---
 .github/dependabot.yml     |  5 -----
 .github/workflows/main.yml |  1 -
 Makefile                   |  6 +-----
 lua/init.lua               | 12 ------------
 lua/os-uni.lua             | 24 ------------------------
 os-uni/Containerfile       | 21 ---------------------
 os-uni/Makefile            | 13 -------------
 os-uni/clangd.yaml         | 13 -------------
 8 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 lua/os-uni.lua
 delete mode 100644 os-uni/Containerfile
 delete mode 100644 os-uni/Makefile
 delete mode 100644 os-uni/clangd.yaml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 500420d..324bb16 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -20,8 +20,3 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 1
-  - package-ecosystem: docker # See documentation for possible values
-    directory: "/os-uni" # Location of package manifests
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf2b871..d78041e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,6 @@ jobs:
         image:
         - collector
         - falco-libs
-        - os-uni
     steps:
     - uses: actions/checkout@v3
 
diff --git a/Makefile b/Makefile
index f253d76..2d7c338 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: all
-all: collector falco os-uni clean deploy
+all: collector falco clean deploy
 
 .PHONY: deploy
 deploy:
@@ -16,7 +16,3 @@ collector:
 .PHONY: falco
 falco:
 	make -C falco-libs build
-
-.PHONY: os-uni
-os-uni:
-	make -C os-uni build
diff --git a/lua/init.lua b/lua/init.lua
index 8a69555..1336bfb 100644
--- a/lua/init.lua
+++ b/lua/init.lua
@@ -1,11 +1,9 @@
 local collector_repo = os.getenv('GOPATH') .. '/src/github.com/stackrox/collector'
 local falco_repo = os.getenv('GOPATH') .. '/src/github.com/falcosecurity/libs'
-local os_uni_repo = os.getenv('GOPATH') .. '/src/github.com/molter73/os-uni'
 local movies_repo = os.getenv('GOPATH') .. '/src/github.com/molter73/movies'
 
 local collector = require('collector')
 local falco = require('falco')
-local os_uni = require('os-uni')
 
 local collector_claim = collector.volume_claim()
 local falco_claim = falco.volume_claim()
@@ -20,7 +18,6 @@ local volumes = {
     { name = 'docker-sock',      hostPath = { path = '/var/run/docker.sock', } },
     { name = 'collector-repo',   hostPath = { path = collector_repo, } },
     { name = 'falco-repo',       hostPath = { path = falco_repo, } },
-    { name = 'os-uni-repo',      hostPath = { path = os_uni_repo, } },
     { name = 'movies-repo',      hostPath = { path = movies_repo, } },
     { name = 'collector-ccache', persistentVolumeClaim = { claimName = collector_claim.metadata.name } },
     { name = 'falco-ccache',     persistentVolumeClaim = { claimName = falco_claim.metadata.name, } },
@@ -54,14 +51,6 @@ local falco_opts = {
     }
 }
 
-local os_uni_opts = {
-    repo_path = os_uni_repo,
-    volumes = {
-        { mountPath = os_uni_repo, name = 'os-uni-repo', },
-        { mountPath = movies_repo, name = 'movies-repo', },
-    },
-}
-
 local metadata = {
     name = 'devcontainers',
     namespace = 'devcontainers',
@@ -74,7 +63,6 @@ local spec = {
     containers = {
         collector.setup(collector_opts),
         falco.setup(falco_opts),
-        os_uni.setup(os_uni_opts),
     },
     volumes = volumes,
 }
diff --git a/lua/os-uni.lua b/lua/os-uni.lua
deleted file mode 100644
index 61dc3e6..0000000
--- a/lua/os-uni.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local name = 'os-uni-builder'
-
-local M = {}
-
-M.setup = function(opts)
-    local repo_path = opts.repo_path or os.exit(1)
-    return {
-        name = name,
-        image = 'quay.io/mmoltras/devcontainers:os-uni',
-        workingDir = repo_path,
-        command = { '/bin/bash', },
-        env = {
-            { name = 'CMAKE_EXPORT_COMPILE_COMMANDS', value = 'ON', },
-        },
-        securityContext = {
-            privileged = true,
-        },
-        volumeMounts = opts.volumes or {},
-        stdin = true,
-        tty = true,
-    }
-end
-
-return M
diff --git a/os-uni/Containerfile b/os-uni/Containerfile
deleted file mode 100644
index edb01ae..0000000
--- a/os-uni/Containerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM fedora:40
-
-# hadolint ignore=DL3041
-RUN dnf install -y \
-    gcc \
-    gdb \
-    procps \
-    make \
-    ncurses \
-    python3-pip \
-    # vvv clangd vvv
-    clang-tools-extra \
-    libasan \
-    libubsan \
-    libtsan \
-    bear && \
-    dnf clean all
-
-COPY clangd.yaml /root/.config/clangd/config.yaml
-
-WORKDIR /workdir
diff --git a/os-uni/Makefile b/os-uni/Makefile
deleted file mode 100644
index bf2c1e7..0000000
--- a/os-uni/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-DEVCONTAINER_IMAGE=quay.io/mmoltras/devcontainers:os-uni
-
-.PHONY: all
-all: build
-
-.PHONY: build
-build:
-	docker build -t $(DEVCONTAINER_IMAGE) \
-		-f $(CURDIR)/Containerfile $(CURDIR)
-
-.PHONY: push
-push: build
-	docker push $(DEVCONTAINER_IMAGE)
diff --git a/os-uni/clangd.yaml b/os-uni/clangd.yaml
deleted file mode 100644
index 243c2bc..0000000
--- a/os-uni/clangd.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-Diagnostics:
-  ClangTidy:
-    Add:
-    - bugprone*
-    - cppcoreguidelines*
-    - modernize*
-    - performance*
-    - readability*
-    Remove:
-    - readability-identifier-length
-    - modernize-use-nodiscard
-    - modernize-use-trailing-return-type
-    - cppcoreguidelines-avoid-magic-numbers