Skip to content

Commit

Permalink
镜像名称调整优化，提交进行自动构建，docker search 可用
Browse files Browse the repository at this point in the history
  • Loading branch information
@supermy
supermy committed Jul 1, 2015
1 parent e942695 commit 7256ce8
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 32 deletions.
2 changes: 1 addition & 1 deletion common/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docker build -t supermy/docker-mytwemproxy:0.3 mytwemproxy
docker build -t supermy/docker-myredis:3.5 myredis
docker build -t supermy/docker-mysql:latest mysql

docker build -t supermy/docker-storm_base:0.9.3 mystorm/storm
docker build -t supermy/docker-storm:0.9.3 mystorm/storm
docker build -t supermy/docker-storm-nimbus:0.9.3 mystorm/storm-nimbus
docker build -t supermy/docker-storm-supervisor:0.9.3 mystorm/storm-supervisor
docker build -t supermy/docker-storm-ui:0.9.3 mystorm/storm-ui
16 changes: 8 additions & 8 deletions common/mydebian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ MAINTAINER supermy <[email protected]>

#RUN sed -i '1,3d' /etc/apt/sources.list

RUN sed -i '4a \
deb http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
deb http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
deb http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
deb-src http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
deb-src http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
deb-src http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
' /etc/apt/sources.list
#RUN sed -i '4a \
# deb http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
# deb http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
# deb http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
# deb-src http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
# deb-src http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
# deb-src http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
# ' /etc/apt/sources.list

# 慢
# deb http://ftp.sjtu.edu.cn/debian/ wheezy main non-free contrib \n \
Expand Down
5 changes: 4 additions & 1 deletion common/mykafka/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ MAINTAINER supermy

RUN apt-get update && apt-get install -y unzip

RUN wget http://mirrors.cnnic.cn/apache/kafka/0.8.2.1/kafka_2.11-0.8.2.1.tgz -O /tmp/kafka_2.11-0.8.2.1.tgz
#http://mirrors.cnnic.cn/apache/kafka/0.8.2.1/kafka_2.11-0.8.2.1.tgz -O /tmp/kafka_2.11-0.8.2.1.tgz
#http://apache.fayea.com/kafka/0.8.2.1/kafka_2.11-0.8.2.1.tgz
RUN wget http://apache.fayea.com/kafka/0.8.2.1/kafka_2.11-0.8.2.1.tgz -O /tmp/kafka_2.11-0.8.2.1.tgz

RUN tar xfz /tmp/kafka_2.11-0.8.2.1.tgz -C /opt

RUN rm /tmp/kafka_2.11-0.8.2.1.tgz
Expand Down
2 changes: 1 addition & 1 deletion common/myrabbitmq/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN echo 'deb http://packages.erlang-solutions.com/debian wheezy contrib' > /etc
RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F78372A06FF50C80464FC1B4F7B8CEA6056E8E56
RUN echo 'deb http://www.rabbitmq.com/debian/ testing main' > /etc/apt/sources.list.d/rabbitmq.list

ENV RABBITMQ_VERSION 3.5.1-1
ENV RABBITMQ_VERSION 3.5.3-1

RUN apt-get update && apt-get install -y rabbitmq-server=$RABBITMQ_VERSION --no-install-recommends && rm -rf /var/lib/apt/lists/*

Expand Down
9 changes: 5 additions & 4 deletions common/myredis/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/dow
&& rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu

ENV REDIS_VERSION 3.0.0
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.0.tar.gz
ENV REDIS_DOWNLOAD_SHA1 c75fd32900187a7c9f9d07c412ea3b3315691c65
ENV REDIS_VERSION 3.0.2
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.2.tar.gz
ENV REDIS_DOWNLOAD_SHA1 a38755fe9a669896f7c5d8cd3ebbf76d59712002


# for redis-sentinel see: http://redis.io/topics/sentinel
RUN buildDeps='gcc libc6-dev make'; \
Expand All @@ -38,7 +39,7 @@ RUN mkdir /data && chown redis:redis /data
VOLUME /data
WORKDIR /data

COPY docker-entrypoint.sh /entrypoint.sh
COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

EXPOSE 6379
Expand Down
9 changes: 9 additions & 0 deletions common/myredis/entrypoint.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
set -e

if [ "$1" = 'redis-server' ]; then
chown -R redis .
exec gosu redis "$@"
fi

exec "$@"
2 changes: 1 addition & 1 deletion common/mysolr/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM supermy/docker-jre:7

ENV SOLR_VERSION 4.10.2
ENV SOLR_VERSION 4.10.4
ENV MYSOLR solr-$SOLR_VERSION

#procps是一个实用程序包，主要包括ps top kill等程序主要用来显示与控制一些系统信息，进程状态之类的内容。
Expand Down
2 changes: 1 addition & 1 deletion common/mystorm/storm-nimbus/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM supermy/docker-storm_base:0.9.3
FROM supermy/docker-storm:0.9.3
MAINTAINER supermy<[email protected]>

RUN /usr/bin/config-supervisord.sh nimbus
Expand Down
2 changes: 1 addition & 1 deletion common/mystorm/storm-supervisor/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM supermy/docker-storm_base:0.9.3
FROM supermy/docker-storm:0.9.3
MAINTAINER supermy<[email protected]>

EXPOSE 6700
Expand Down
2 changes: 1 addition & 1 deletion common/mystorm/storm-ui/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM supermy/docker-storm_base:0.9.3
FROM supermy/docker-storm:0.9.3
MAINTAINER supermy<[email protected]>
RUN /usr/bin/config-supervisord.sh ui

Expand Down
2 changes: 0 additions & 2 deletions sync-docker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ rsync -avz web+app/mytomcat/* /Users/moyong/project/env-myopensource/3-tools/d
# 同步到网上数据库




cd /Users/moyong/project/env-myopensource/3-tools/docker/apps/docker-debian/
sh /Users/moyong/project/env-myopensource/3-tools/docker/mygit.sh 更新项目名称
cd /Users/moyong/project/env-myopensource/3-tools/docker/apps/docker-jdk/
Expand Down
22 changes: 11 additions & 11 deletions web+app/mynginx/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ FROM debian:latest

MAINTAINER supermy <[email protected]>

RUN sed -i '1,3d' /etc/apt/sources.list
RUN echo '#hello'>> /etc/apt/sources.list

RUN sed -i '1a \
deb http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
deb http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
deb http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
deb-src http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
deb-src http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
deb-src http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
' /etc/apt/sources.list
#RUN sed -i '1,3d' /etc/apt/sources.list
#RUN echo '#hello'>> /etc/apt/sources.list

#RUN sed -i '1a \
# deb http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
# deb http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
# deb http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
# deb-src http://mirrors.163.com/debian/ wheezy main non-free contrib \n \
# deb-src http://mirrors.163.com/debian/ wheezy-proposed-updates main contrib non-free \n \
# deb-src http://mirrors.163.com/debian-security/ wheezy/updates main contrib non-free \n \
# ' /etc/apt/sources.list

# sohu 更新服务器：
#RUN sed -i '1a \
Expand Down

0 comments on commit 7256ce8

Please sign in to comment.