Skip to content

Commit

Permalink
Merge pull request #5831 from jkonecny12/master-remove-host-network-f…
Browse files Browse the repository at this point in the history
…or-containers

infra: Remove use of host network in containers
  • Loading branch information
jkonecny12 authored Aug 16, 2024
2 parents da10cc1 + 24ae9e7 commit 730d254
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ CONTAINER_ENGINE ?= podman
# Network needs to use host configuration so it is sharing VPN connection
CONTAINER_BUILD_ARGS ?= --no-cache --network=host
# run tweaks for all containers
# Network needs to use host configuration so it is sharing VPN connection
CONTAINER_RUN_ARGS ?= --tty --interactive --network=host
CONTAINER_RUN_ARGS ?= --tty --interactive
# HACK: bash's builtin `test -r` fails when running on Ubuntu host (GitHub) due to incompatible seccomp profile
CONTAINER_TEST_ARGS ?= $(shell grep -q ID=ubuntu /etc/os-release && echo --security-opt=seccomp=unconfined)
CONTAINER_REGISTRY ?= quay.io
Expand Down Expand Up @@ -363,6 +362,8 @@ container-iso-build:
exit 1; \
fi

@echo 'If you need VPN access, please use `CONTAINER_ADD_ARGS=--network=host`'

mkdir -p result/iso
sudo $(CONTAINER_ENGINE) run \
--rm \
Expand All @@ -388,6 +389,8 @@ container-live-iso-build:

@sudo -nv 2>/dev/null || echo "You will be prompted for sudo password because of loop device mounting in Lorax!"

@echo 'If you need VPN access, please use `CONTAINER_ADD_ARGS=--network=host`'

@if ! ls $(srcdir)/result/build/01-rpm-build/anaconda-*.rpm >/dev/null 2>/dev/null; then \
echo "You need to have anaconda RPMs build first. Please run 'make -f ./Makefile.am container-rpms-scratch' before this command."; \
exit 1; \
Expand Down

0 comments on commit 730d254

Please sign in to comment.