Skip to content

Commit

Permalink
Add --ignore-eol option that allows to run ue4-docker build even on E…
Browse files Browse the repository at this point in the history
…OL Windows versions
  • Loading branch information
slonopotamus committed May 25, 2021
1 parent e1a7ce6 commit 057f018
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ue4docker/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def build():
logger.info('Directory to copy DLLs from: {}\n'.format(config.dlldir), False)

# Verify that the specified base image tag is not a release that has reached End Of Life (EOL)
if WindowsUtils.isEndOfLifeWindowsVersion(config.basetag) == True:
if not config.ignoreEOL and WindowsUtils.isEndOfLifeWindowsVersion(config.basetag):
logger.error('Error: detected EOL base OS image tag: {}'.format(config.basetag), False)
logger.error('This version of Windows has reached End Of Life (EOL), which means', False)
logger.error('Microsoft no longer supports or maintains container base images for it.', False)
Expand Down
2 changes: 2 additions & 0 deletions ue4docker/infrastructure/BuildConfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def addArguments(parser):
parser.add_argument('--combine', action='store_true', help='Combine generated Dockerfiles into a single multi-stage build Dockerfile')
parser.add_argument('--monitor', action='store_true', help='Monitor resource usage during builds (useful for debugging)')
parser.add_argument('-interval', type=float, default=20.0, help='Sampling interval in seconds when resource monitoring has been enabled using --monitor (default is 20 seconds)')
parser.add_argument('--ignore-eol', action='store_true', help='Run builds even on EOL versions of Windows (advanced use only)')
parser.add_argument('--ignore-blacklist', action='store_true', help='Run builds even on blacklisted versions of Windows (advanced use only)')
parser.add_argument('-v', '--verbose', action='store_true', help='Enable verbose output during builds (useful for debugging)')

Expand Down Expand Up @@ -150,6 +151,7 @@ def __init__(self, parser, argv):
self.excludedComponents = set(self.args.exclude)
self.baseImage = None
self.prereqsTag = None
self.ignoreEOL = self.args.ignore_eol
self.ignoreBlacklist = self.args.ignore_blacklist
self.verbose = self.args.verbose
self.layoutDir = self.args.layout
Expand Down

0 comments on commit 057f018

Please sign in to comment.