* updating to java 7u55

Update README.md
Formatting fix
2026-02-17 15:13:55 +00:00 · 2014-07-19 16:31:24 +00:00 · 2014-07-14 14:16:47 -05:00 · 2014-06-29 22:53:16 +00:00 · 2014-06-29 22:51:41 +00:00 · 2014-06-29 22:44:51 +00:00
15 changed files with 103 additions and 5 deletions
--- a/elasticsearch-marvel/README.md
+++ b/elasticsearch-marvel/README.md
@@ -1,7 +1,11 @@
 This image extends the official elasticsearch image by adding the Marvel Sense plugin. This will get you a system ready to use with the [ElasticSearch Getting Started Guide](http://www.elasticsearch.org/guide/en/elasticsearch/guide/current).

-With Marvel Sense installed you can access it using a URL like:
+Start the container with a command-line such as

-    http://192.168.1.216:9200/_plugin/marvel/sense/index.html
+    docker run -d --name es -p 9200:9200 -p 9300:9300 itzg/elasticsearch-marvel
+
+and now with Marvel Sense installed you can access it using a URL like:
+
+    http://192.168.59.103:9200/_plugin/marvel/sense/index.html
    
 (replacing the IP address shown here with your Docker host's)
--- a/jekyll-github-pages/.gitignore
+++ b/jekyll-github-pages/.gitignore
@@ -0,0 +1 @@
+/site
--- a/jekyll-github-pages/Dockerfile
+++ b/jekyll-github-pages/Dockerfile
@@ -0,0 +1,22 @@
+FROM ubuntu:trusty
+
+MAINTAINER itzg
+
+RUN apt-get update
+RUN apt-get -y upgrade
+
+RUN apt-get -y install ruby ruby-dev make patch
+RUN gem install bundler
+
+ADD Gemfile /tmp/Gemfile
+WORKDIR /tmp
+RUN bundle install
+
+ADD template /site-template
+
+VOLUME ["/site"]
+EXPOSE 4000
+
+ADD start.sh /start
+CMD ["/start"]
+
--- a/jekyll-github-pages/Gemfile
+++ b/jekyll-github-pages/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'github-pages'
--- a/jekyll-github-pages/README.md
+++ b/jekyll-github-pages/README.md
@@ -0,0 +1,14 @@
+This container is pre-configured according to the 
+[GitHub Pages use of Jekyll](https://help.github.com/articles/using-jekyll-with-pages).
+
+It serves up the generated content on port 4000 and the site is generated from
+the container's `/site` volume. You can either bring your own site content or
+let it generate some VERY simple content along with the standard Jekyll directory
+layout.
+
+A typical way to run this:
+
+    docker run -it -p 4000:4000 -v $(pwd)/site:/site itzg/jekyll-github-pages
+
+where either it will load your content or initialize the content under
+`site` in your current working directory.
--- a/jekyll-github-pages/start.sh
+++ b/jekyll-github-pages/start.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ `ls /site/index.* 2> /dev/null | wc -l` = 0 ]; then
+  echo "Preparing /site with default content..."
+  cp -r /site-template/* /site
+fi
+
+if [ ! -e /site/Gemfile ]; then
+  cp /tmp/Gemfile /site/Gemfile
+fi
+
+cd /site
+bundle exec jekyll serve
--- a/jekyll-github-pages/template/_config.yml
+++ b/jekyll-github-pages/template/_config.yml
--- a/jekyll-github-pages/template/_includes/footer.html
+++ b/jekyll-github-pages/template/_includes/footer.html
@@ -0,0 +1,3 @@
+<footer>
+  <i>Goodbye</i>
+</footer>
--- a/jekyll-github-pages/template/_includes/header.html
+++ b/jekyll-github-pages/template/_includes/header.html
@@ -0,0 +1,3 @@
+<header>
+  <h1>{{ page.title }}</h1>
+</header>
--- a/jekyll-github-pages/template/_includes/top.html
+++ b/jekyll-github-pages/template/_includes/top.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <title>{{ page.title }}</title>
+
+  <!-- Latest compiled and minified CSS -->
+  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+
+  <!-- Optional theme -->
+  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
+
+  <!-- Latest compiled and minified JavaScript -->
+  <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+</head>
--- a/jekyll-github-pages/template/_layouts/default.html
+++ b/jekyll-github-pages/template/_layouts/default.html
@@ -0,0 +1,12 @@
+{% include top.html %}
+
+<body>
+
+  {% include header.html %}
+
+  {{ content }}
+
+  {% include footer.html %}
+
+</body>
+</html>
--- a/jekyll-github-pages/template/index.html
+++ b/jekyll-github-pages/template/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Powered by Jekyll
+overview: true
+---
+This is where the content goes.
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -11,13 +11,13 @@ RUN chmod +x /usr/bin/jsawk

 EXPOSE 25565

-ADD run.sh /run
+ADD start.sh /start

 VOLUME ['/data']
 ADD server.properties /tmp/server.properties
 WORKDIR /data

-ENTRYPOINT /run
+CMD /start

 ENV MOTD A Minecraft Server Powered by Docker
 ENV LEVEL world
--- a/minecraft-server/start.sh
+++ b/minecraft-server/start.sh
--- a/ubuntu-openjdk-7/Dockerfile
+++ b/ubuntu-openjdk-7/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:trusty

 MAINTAINER itzg

-ENV BUILT_ON 20140517
+ENV APT_GET_UPDATE 2014-07-19

 RUN apt-get update
 RUN apt-get install -y openjdk-7-jre-headless
Author	SHA1	Message	Date
Geoff Bourne	b354ba5981	* updating to java 7u55	2014-07-19 16:31:24 +00:00
Geoff Bourne	6dbbcf61b7	Update README.md	2014-07-14 14:16:47 -05:00
Geoff Bourne	159c38c194	Formatting fix	2014-06-29 22:53:16 +00:00
Geoff Bourne	bef6a36476	Renamed /run to /start to avoid collisions	2014-06-29 22:51:41 +00:00
Geoff Bourne	ebb4ee2214	Adding Jekyll container which includes very basic starter content	2014-06-29 22:44:51 +00:00