Skip to content

Allow extra docker build parameters for 'create-builder-image' #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NikolausDemmel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow extra docker build parameters for 'create-builder-image' #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/fpm/dockery/cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ def create_builder_if_required
image_check = Subprocess.run("docker images | awk '{print $1}' | grep fpm-dockery/#{builder}")
unless image_check.exitstatus == 0
warn "The builder image '#{builder}' does not exist; running the image creation for you"
create_builder(false)
create_builder(false, [])
end
end

# Create a builder image.
def create_builder(no_cache)
def create_builder(no_cache, extra_docker_commands)
validate_builder!
cache_option = no_cache ? '--no-cache=true' : ''
exit_status = Subprocess.run("docker build #{cache_option} -f #{FPM::Dockery.root}/docker/Dockerfile.#{builder} -t fpm-dockery/#{builder} #{FPM::Dockery.root}")
exit_status = Subprocess.run("docker build --pull #{extra_docker_commands.join(' ')} #{cache_option} -f #{FPM::Dockery.root}/docker/Dockerfile.#{builder} -t fpm-dockery/#{builder} #{FPM::Dockery.root}")
if exit_status.exitstatus == 0
info "Build complete"
else
Expand All @@ -55,9 +55,13 @@ def execute
class CreateBuilderImage < BaseCommand
parameter "BUILDER", "Type of builder image to build"
option "--no-cache", :flag, "Build without cache"
option "--docker-params", "DOCKER_PARAMS", "Extra Docker build parameters"

def execute
create_builder(no_cache?)
extra_docker_commands = []
extra_docker_commands << docker_params if docker_params

create_builder(no_cache?, extra_docker_commands)
end
end

Expand Down