Skip to content

Commit 33e47c0

Browse files
committed
Merge branch 'develop'
2 parents 9b44fbc + 1efad94 commit 33e47c0

File tree

4 files changed

+76
-5
lines changed

4 files changed

+76
-5
lines changed

Makefile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# ============================================================
2+
# Author: Chu-Siang Lai / chusiang (at) drx.tw
3+
# Blog: http://note.drx.tw
4+
# Filename: Makefile
5+
# Modified: 2016-11-30 12:51
6+
# Description: Do something with make.
7+
# ===========================================================
8+
9+
.PHONY: main pull run start stop clean retag_latest
10+
11+
main: run
12+
13+
# Only download the docker image.
14+
pull:
15+
docker pull chusiang/ansible-jupyter:alpine-3.4
16+
docker pull chusiang/ansible-managed-node:alpine-3.4
17+
docker pull chusiang/ansible-managed-node:centos-7
18+
docker pull chusiang/ansible-managed-node:debian-8
19+
docker pull chusiang/ansible-managed-node:ubuntu-14.04
20+
21+
# Run containers.
22+
run:
23+
docker-compose up
24+
25+
# Start containers.
26+
start:
27+
docker-compose start
28+
29+
# Stop containers.
30+
stop:
31+
docker-compose stop
32+
33+
# Remove containers.
34+
clean:
35+
docker-compose rm -f
36+
37+
# Retag and push the latest tag.
38+
retag_latest:
39+
sh bin/retag_latest.sh
40+

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Docker image: Ansible on Jupyter Notebook
22

3+
[![Docker Hub](https://img.shields.io/badge/docker-ansible--jupyter-blue.svg)](https://hub.docker.com/r/chusiang/ansible-jupyter/)
4+
[![](https://images.microbadger.com/badges/image/chusiang/ansible-jupyter.svg)](https://microbadger.com/images/chusiang/ansible-jupyter "Get your own image badge on microbadger.com")
5+
36
A Docker image for run [Ansible][ansible_official] 2.2 on [Jupyter Notebook][jupyter_official] 4.2 (ipython notebook) with Browsers.
47

58
[ansible_official]: https://www.ansible.com/

docker-compose.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: '2'
2+
services:
3+
4+
control-machine:
5+
ports:
6+
- 8888:8888/tcp
7+
image: chusiang/ansible-jupyter:alpine-3.4
8+
9+
managed-node-ubuntu-14.04:
10+
ports:
11+
- 2221:22/tcp
12+
image: chusiang/ansible-managed-node:ubuntu-14.04
13+
14+
managed-node-debian-8:
15+
ports:
16+
- 2222:22/tcp
17+
image: chusiang/ansible-managed-node:debian-8
18+
19+
managed-node-centos-7:
20+
ports:
21+
- 2223:22/tcp
22+
image: chusiang/ansible-managed-node:centos-7
23+
24+
managed-node-alpine:
25+
ports:
26+
- 2224:22/tcp
27+
image: chusiang/ansible-managed-node:alpine-3.4
28+

setup_jupyter.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- openssl
1515

1616
# Alpine Linux.
17-
apk_packages:
17+
apk_packages:
1818
- openssh-client
1919
- vim
2020

@@ -37,7 +37,7 @@
3737
- openssl
3838
- sqlite
3939
- vim
40-
40+
4141
# CentOS.
4242
yum_packages:
4343
- openssh-clients
@@ -54,7 +54,7 @@
5454
ssh_private_key_url: "https://raw.githubusercontent.com/chusiang/ansible-jupyter.dockerfile/master/files/ssh/id_rsa"
5555
ansible_cfg_url: "https://raw.githubusercontent.com/chusiang/ansible-jupyter.dockerfile/master/ansible.cfg"
5656
inventory_url: "https://raw.githubusercontent.com/chusiang/ansible-jupyter.dockerfile/master/inventory"
57-
57+
5858
tasks:
5959
# General Linux.
6060
- name: install same packages
@@ -127,14 +127,14 @@
127127

128128
# Only install Jupyter.
129129
- name: install the jupyter notebook
130-
pip: name=jupyter version=1.0.0 state=present
130+
pip: name=jupyter version=1.0.0 state=present
131131

132132
# Create `ssh_config` directory.
133133
- name: create `/root/.ssh` directory
134134
file: path=/root/.ssh state=directory mode=0700
135135

136136
# Get the ssh private key.
137-
- name: get the ssh private key
137+
- name: get the ssh private key
138138
get_url: >
139139
url={{ ssh_private_key_url }} dest=/root/.ssh/id_rsa mode=0600
140140
checksum=md5:6cc26e77bf23a9d72a51b22387bea61f

0 commit comments

Comments
 (0)