From: Lorin Hochstein <lhochstein@netflix.com>
Date: Mon, 24 Apr 2017 03:59:20 +0000 (-0700)
Subject: container file and makefile
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=c6b1d95e32248d85c9cb9bd4272ebfeac4c412f3;p=ansiblebook.git

container file and makefile
---

diff --git a/ans-con/Makefile b/ans-con/Makefile
new file mode 100644
index 0000000..be3ce34
--- /dev/null
+++ b/ans-con/Makefile
@@ -0,0 +1,4 @@
+.PHONY: build
+
+build:
+	ansible-container build
diff --git a/ans-con/container.yml b/ans-con/container.yml
index 350b601..ed11d34 100644
--- a/ans-con/container.yml
+++ b/ans-con/container.yml
@@ -1,64 +1,9 @@
 version: "2"
 settings:
-  # The deployment_output_path is mounted to the Conductor container, so
-  # that the `run` and `deployment` commands can write generated Ansible
-  # playbooks to it.
-  # deployment_output_path: ~/ansible-deployment
-  # The Conductor container does the heavy lifting, and provides a portable
-  # Python runtime for building your target containers. It should be derived
-  # from the same distribution as you're building your target containers with.
   conductor_base: debian:jessie
-
-  # When using the k8s or openshift engines, use the following to authorize with the API.
-  # Values set here will be passed to the Ansible modules. Any file paths will be mounted
-  # to the conductor container, allowing the `run` command to access the API.
-  #k8s_auth:
-    # path to a K8s config file
-    #config_file:
-    # name of a context found within the config.json file
-    #context:
-    # URL for accessing the K8s API
-    #host:
-    # An API authentication token
-    #api_key:
-    # Path to a ca cert file
-    #ssl_ca_cert:
-    # Path to a cert file
-    #cert_file:
-    # Path to a key file
-    #key_file:
-    #boolean, indicating if SSL certs should be validated
-    #verify_ssl:
-
-  # When using the k8s or openshift engines, use the following to set the namespace.
-  # If not set, the project name will be used. For openshift, the namespace maps to a project,
-  # and description and display_name are supported.
-  #k8s_namespace:
-  #  name:
-  #  description:
-  #  display_name:
-
 services:
   ac-nginx:
     from: nginx
     roles:
       - ghost-nginx
-  # Add your containers here, specifying the base image you want to build from
-  # For example:
-  #
-  # web:
-  #   from: centos:7
-  #   roles:
-  #     - apache-container
-  #   ports:
-  #     - "80:80"
-  #   command: ['/usr/bin/dumb-init', '/usr/sbin/apache2ctl', '-D', 'FOREGROUND']
-  #   dev_overrides:
-  #     environment:
-  #       - "DEBUG=1"
-  #
 registries: {}
-  # Add optional registries used for deployment. For example:
-  #  google:
-  #    url: https://gcr.io
-  #    namespace: my-cool-project-xxxxxx