diff options
author | Thomas Wiest <twiest@users.noreply.github.com> | 2014-12-15 16:07:19 -0500 |
---|---|---|
committer | Thomas Wiest <twiest@users.noreply.github.com> | 2014-12-15 16:07:19 -0500 |
commit | 9830202b133db241493ca3f3d914e1cb1de35963 (patch) | |
tree | 0bb33e5ee852ea533f1f808a8e86e38c97699bb4 /roles/docker_img_build | |
parent | 2848232bdaed44fadb51548fe9d6c39fe89b8e11 (diff) | |
parent | 023f92f9e3eec7de6c1286549000be79189a4fde (diff) | |
download | openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.gz openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.bz2 openshift-9830202b133db241493ca3f3d914e1cb1de35963.tar.xz openshift-9830202b133db241493ca3f3d914e1cb1de35963.zip |
Merge pull request #36 from twiest/pr
changed atomic proxy to use pre-built container images
Diffstat (limited to 'roles/docker_img_build')
-rw-r--r-- | roles/docker_img_build/README.md | 36 | ||||
-rw-r--r-- | roles/docker_img_build/defaults/main.yml | 2 | ||||
-rwxr-xr-x | roles/docker_img_build/files/ops-build-container.sh | 56 | ||||
-rw-r--r-- | roles/docker_img_build/handlers/main.yml | 2 | ||||
-rw-r--r-- | roles/docker_img_build/meta/main.yml | 14 | ||||
-rw-r--r-- | roles/docker_img_build/tasks/main.yml | 6 | ||||
-rw-r--r-- | roles/docker_img_build/vars/main.yml | 2 |
7 files changed, 0 insertions, 118 deletions
diff --git a/roles/docker_img_build/README.md b/roles/docker_img_build/README.md deleted file mode 100644 index cf332cde7..000000000 --- a/roles/docker_img_build/README.md +++ /dev/null @@ -1,36 +0,0 @@ -Role Name -========= - -The purpose of this role is to setup tools to do docker image builds - -Requirements ------------- - -Docker - -Role Variables --------------- - -None - -Dependencies ------------- - -None - -Example Playbook ----------------- - - - hosts: servers - roles: - - docker_img_build - -License -------- - -ASL 2.0 - -Author Information ------------------- - -Thomas Wiest diff --git a/roles/docker_img_build/defaults/main.yml b/roles/docker_img_build/defaults/main.yml deleted file mode 100644 index 087287db1..000000000 --- a/roles/docker_img_build/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for docker_img_build diff --git a/roles/docker_img_build/files/ops-build-container.sh b/roles/docker_img_build/files/ops-build-container.sh deleted file mode 100755 index 308fbd58c..000000000 --- a/roles/docker_img_build/files/ops-build-container.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -RED=$(echo -e "\e[31m") -GREEN=$(echo -e "\e[32m") -YELLOW=$(echo -e "\e[33m") -BLUE=$(echo -e "\e[34m") -NORM=$(echo -e "\e[0m") - -CTR_DIR='/usr/local/etc/containers' - -EXIT_CODE=0 - -function main() -{ - # Make sure we're in the directory we expect to be in - cd $CTR_DIR - - TAG=$(echo $1 | sed 's/_container[\/]*//') - if [ -z "$TAG" ] - then - echo "FAILED parsing tag from \$1 [$1]" - exit 10 - fi - - docker build --rm -t $TAG $1 - EXIT_CODE=$? -} - -if [ $# -ne 1 ] -then - echo - echo " Usage: $(basename $0) container" - echo "Example: $(basename $0) monitoring_container" - echo - exit -fi - -if ! [ -d "$CTR_DIR/$1" ] -then - echo "Error: directory not found [$CTR_DIR/$1]" - exit 10 -fi - -time main $@ -echo -echo - -if [ $EXIT_CODE -eq 0 ] -then - echo "${GREEN}$1 build succeeded.${NORM}" -else - echo "${RED}$1 build FAILED!${NORM}" -fi - -echo -exit $EXIT_CODE diff --git a/roles/docker_img_build/handlers/main.yml b/roles/docker_img_build/handlers/main.yml deleted file mode 100644 index 9b5fe2b3d..000000000 --- a/roles/docker_img_build/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for docker_img_build diff --git a/roles/docker_img_build/meta/main.yml b/roles/docker_img_build/meta/main.yml deleted file mode 100644 index 40f83bf2f..000000000 --- a/roles/docker_img_build/meta/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -galaxy_info: - author: Thomas Wiest - description: Tools to do docker image builds - company: Red Hat - license: ASL 2.0 - min_ansible_version: 1.6 - platforms: - - name: EL - versions: - - 7 - categories: - - docker -dependencies: [] diff --git a/roles/docker_img_build/tasks/main.yml b/roles/docker_img_build/tasks/main.yml deleted file mode 100644 index aaa2fae25..000000000 --- a/roles/docker_img_build/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: mkdir -p /usr/local/etc/containers - file: dest=/usr/local/etc/containers state=directory - -- name: deploy ops-build-container.sh - copy: src=ops-build-container.sh dest=/usr/local/bin/ops-build-container.sh mode=755 diff --git a/roles/docker_img_build/vars/main.yml b/roles/docker_img_build/vars/main.yml deleted file mode 100644 index ddb684fda..000000000 --- a/roles/docker_img_build/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for docker_img_build |