From c7baa8bc3498fb21fb565438d45742862f0f74bf Mon Sep 17 00:00:00 2001
From: Cory Latschkowski <koree@redhat.com>
Date: Sun, 14 Apr 2024 03:51:17 -0500
Subject: [PATCH] Fix: linux (w/ selinux) build (#2004)

* add: check for selinux for vol mount

* update: install packages first

build time not increased if script changes

* update: selinux check
---
 Dockerfile.dev     | 11 +++++++----
 Makefile.variables |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 8b40b647..c08af612 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,12 +1,15 @@
 FROM golang:1.22.1
 
+RUN apt-get update && \
+    apt-get install -y npm && \
+    npm install -g npx cspell@latest
+
 COPY scripts/devtools.sh /opt/devtools.sh
 
-RUN set -e -x \
-    && /opt/devtools.sh
-ENV PATH=/go/bin:$PATH
+RUN set -e -x && \
+    /opt/devtools.sh
 
-RUN apt-get update && apt-get install -y npm && npm install -g npx cspell@latest
+ENV PATH=/go/bin:$PATH
 
 ENV CGO_ENABLED 0
 ENV GOPATH /go:/yq
diff --git a/Makefile.variables b/Makefile.variables
index f9669c16..110cea72 100644
--- a/Makefile.variables
+++ b/Makefile.variables
@@ -26,6 +26,7 @@ ifeq ($(CYG_CHECK),1)
 else
 	# all non-windows environments
 	ROOT := $(shell pwd)
+	SELINUX := $(shell which getenforce 2>&1 >/dev/null && echo :z)
 endif
 
 DEV_IMAGE := ${PROJECT}_dev
@@ -33,7 +34,7 @@ DEV_IMAGE := ${PROJECT}_dev
 ENGINERUN := ${ENGINE} run --rm \
 	-e LDFLAGS="${LDFLAGS}" \
 	-e GITHUB_TOKEN="${GITHUB_TOKEN}" \
-	-v ${ROOT}/vendor:/go/src \
-	-v ${ROOT}:/${PROJECT}/src/${IMPORT_PATH} \
+	-v ${ROOT}/vendor:/go/src${SELINUX} \
+	-v ${ROOT}:/${PROJECT}/src/${IMPORT_PATH}${SELINUX} \
 	-w /${PROJECT}/src/${IMPORT_PATH} \
 	${DEV_IMAGE}