Add `SKIP_AIRGAP` enviroment variable for make (#4688)

* Add SKIP_AIRGAP build flag Signed-off-by: Derek Nola <derek.nola@suse.com>

Add `SKIP_AIRGAP` enviroment variable for make (#4688)
eb068da7 · Derek Nola · GitHub · 1e069662 · eb068da7 · eb068da7
Unverified Commit eb068da7 authored Dec 08, 2021 by Derek Nola Committed by GitHub Dec 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Dockerfile.dapper Dockerfile.dapper +1 -1

package scripts/package +4 -2

No files found.
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -41,7 +41,7 @@ ENV SELINUX $SELINUX

 ENV GO111MODULE off
 ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy
-ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE GCLOUD_AUTH GITHUB_TOKEN GOLANG
+ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG
 ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
 ENV DAPPER_OUTPUT ./bin ./dist ./build/out
 ENV DAPPER_DOCKER_SOCKET true

--- a/scripts/package
+++ b/scripts/package
@@ -8,5 +8,7 @@ if [ ! -e ../bin/containerd ]; then
 fi

 ./package-cli
-./package-image
-./package-airgap
+if [ -z "$SKIP_AIRGAP" ]; then
+    ./package-image
+    ./package-airgap
+fi