Skip to content

Commit

Permalink
RELEASE: adding 2.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
anapsix committed Feb 22, 2016
1 parent 7eb1862 commit d88634f
Show file tree
Hide file tree
Showing 9 changed files with 225 additions and 1 deletion.
24 changes: 24 additions & 0 deletions debian/jessie/2.2.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM debian:jessie

MAINTAINER Anastas Dancha <[email protected]>

ENV RETHINKDB_PACKAGE_VERSION 2.2.4

# Add the RethinkDB repository and public key
# "RethinkDB Packaging <[email protected]>" http://download.rethinkdb.com/apt/pubkey.gpg
RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 1614552E5765227AEC39EFCFA7E00EF33A8F2399 && \
echo "deb http://download.rethinkdb.com/apt jessie main" > /etc/apt/sources.list.d/rethinkdb.list && \
apt-get update && \
apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION* && \
apt-get install -y --no-install-recommends bind9-host && \
rm -rf /var/lib/apt/lists/*

COPY docker-entrypoint.sh /entrypoint.sh

VOLUME ["/data"]
WORKDIR /data
# process cluster webui
EXPOSE 28015 29015 8080
ENTRYPOINT ["/entrypoint.sh"]
CMD ["--bind","all"]

32 changes: 32 additions & 0 deletions debian/jessie/2.2.4/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
set -e

if [ ${#} -eq 0 ] || [ "${1:0:1}" = '-' ]; then
[ -n "$DOCKERCLOUD_CONTAINER_FQDN" ] && DOCKERCLOUD_ARGS+=( --canonical-address $DOCKERCLOUD_CONTAINER_FQDN )
[ -n "$DOCKERCLOUD_IP_ADDRESS" ] && DOCKERCLOUD_ARGS+=( --canonical-address ${DOCKERCLOUD_IP_ADDRESS%/*} )
if [ -n "$DOCKERCLOUD_SERVICE_HOSTNAME" ]; then
TRY_UNTIL=$(date +%s -d "+ 30 seconds")
DOCKERCLOUD_CLUSTER_HOSTS=0
for host in $(host -s -t a $DOCKERCLOUD_SERVICE_HOSTNAME | awk '{print $NF}'); do
echo -n "waiting for $host to become available: " >&2
while test $[$TRY_UNTIL-$(date +%s)] -gt 0; do
if ping -q -w 1 -c 1 $host >/dev/null 2>&1; then
echo "ok" >&2
let DOCKERCLOUD_CLUSTER_HOSTS+=1
DOCKERCLOUD_ARGS+=( --join $host )
break
else
echo -n "." >&2
fi
done
done
if [ $DOCKERCLOUD_CLUSTER_HOSTS -lt 2 ]; then
echo "seems like we are running in single node mode" >&2
echo "only one node started or cluster discovery timed-out" >&2
fi
fi
#[ -n "$DOCKERCLOUD_ARGS" ] && DOCKERCLOUD_ARGS+=( --bind all )
set -- rethinkdb "$@" "${DOCKERCLOUD_ARGS[@]}"
fi

exec "$@"
24 changes: 24 additions & 0 deletions debian/wheezy/2.2.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM debian:wheezy

MAINTAINER Anastas Dancha <[email protected]>

ENV RETHINKDB_PACKAGE_VERSION 2.2.4

# Add the RethinkDB repository and public key
# "RethinkDB Packaging <[email protected]>" http://download.rethinkdb.com/apt/pubkey.gpg
RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 1614552E5765227AEC39EFCFA7E00EF33A8F2399 && \
echo "deb http://download.rethinkdb.com/apt wheezy main" > /etc/apt/sources.list.d/rethinkdb.list && \
apt-get update && \
apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION* && \
apt-get install -y --no-install-recommends bind9-host && \
rm -rf /var/lib/apt/lists/*

COPY docker-entrypoint.sh /entrypoint.sh

VOLUME ["/data"]
WORKDIR /data
# process cluster webui
EXPOSE 28015 29015 8080
ENTRYPOINT ["/entrypoint.sh"]
CMD ["--bind","all"]

32 changes: 32 additions & 0 deletions debian/wheezy/2.2.4/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
set -e

if [ ${#} -eq 0 ] || [ "${1:0:1}" = '-' ]; then
[ -n "$DOCKERCLOUD_CONTAINER_FQDN" ] && DOCKERCLOUD_ARGS+=( --canonical-address $DOCKERCLOUD_CONTAINER_FQDN )
[ -n "$DOCKERCLOUD_IP_ADDRESS" ] && DOCKERCLOUD_ARGS+=( --canonical-address ${DOCKERCLOUD_IP_ADDRESS%/*} )
if [ -n "$DOCKERCLOUD_SERVICE_HOSTNAME" ]; then
TRY_UNTIL=$(date +%s -d "+ 30 seconds")
DOCKERCLOUD_CLUSTER_HOSTS=0
for host in $(host -s -t a $DOCKERCLOUD_SERVICE_HOSTNAME | awk '{print $NF}'); do
echo -n "waiting for $host to become available: " >&2
while test $[$TRY_UNTIL-$(date +%s)] -gt 0; do
if ping -q -w 1 -c 1 $host >/dev/null 2>&1; then
echo "ok" >&2
let DOCKERCLOUD_CLUSTER_HOSTS+=1
DOCKERCLOUD_ARGS+=( --join $host )
break
else
echo -n "." >&2
fi
done
done
if [ $DOCKERCLOUD_CLUSTER_HOSTS -lt 2 ]; then
echo "seems like we are running in single node mode" >&2
echo "only one node started or cluster discovery timed-out" >&2
fi
fi
#[ -n "$DOCKERCLOUD_ARGS" ] && DOCKERCLOUD_ARGS+=( --bind all )
set -- rethinkdb "$@" "${DOCKERCLOUD_ARGS[@]}"
fi

exec "$@"
2 changes: 1 addition & 1 deletion generate_dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# re-generate Dockerfile for requested distribution(s)

dists=( ubuntu:trusty ubuntu:utopic debian:wheezy debian:jessie )
versions=( 1.15.1 1.15.2 1.15.3 1.16.0 1.16.1 1.16.2 1.16.3 2.0.0 2.0.1 2.0.2 2.0.3 2.0.4 2.1.0 2.1.1 2.1.3 2.1.4 2.1.5 2.2.0 2.2.1 2.2.2 2.2.3 )
versions=( 1.15.1 1.15.2 1.15.3 1.16.0 1.16.1 1.16.2 1.16.3 2.0.0 2.0.1 2.0.2 2.0.3 2.0.4 2.1.0 2.1.1 2.1.3 2.1.4 2.1.5 2.2.0 2.2.1 2.2.2 2.2.3 2.2.4)

DOCKERFILE_TEMPLATE=Dockerfile.tpl

Expand Down
24 changes: 24 additions & 0 deletions ubuntu/trusty/2.2.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM ubuntu:trusty

MAINTAINER Anastas Dancha <[email protected]>

ENV RETHINKDB_PACKAGE_VERSION 2.2.4

# Add the RethinkDB repository and public key
# "RethinkDB Packaging <[email protected]>" http://download.rethinkdb.com/apt/pubkey.gpg
RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 1614552E5765227AEC39EFCFA7E00EF33A8F2399 && \
echo "deb http://download.rethinkdb.com/apt trusty main" > /etc/apt/sources.list.d/rethinkdb.list && \
apt-get update && \
apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION* && \
apt-get install -y --no-install-recommends bind9-host && \
rm -rf /var/lib/apt/lists/*

COPY docker-entrypoint.sh /entrypoint.sh

VOLUME ["/data"]
WORKDIR /data
# process cluster webui
EXPOSE 28015 29015 8080
ENTRYPOINT ["/entrypoint.sh"]
CMD ["--bind","all"]

32 changes: 32 additions & 0 deletions ubuntu/trusty/2.2.4/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
set -e

if [ ${#} -eq 0 ] || [ "${1:0:1}" = '-' ]; then
[ -n "$DOCKERCLOUD_CONTAINER_FQDN" ] && DOCKERCLOUD_ARGS+=( --canonical-address $DOCKERCLOUD_CONTAINER_FQDN )
[ -n "$DOCKERCLOUD_IP_ADDRESS" ] && DOCKERCLOUD_ARGS+=( --canonical-address ${DOCKERCLOUD_IP_ADDRESS%/*} )
if [ -n "$DOCKERCLOUD_SERVICE_HOSTNAME" ]; then
TRY_UNTIL=$(date +%s -d "+ 30 seconds")
DOCKERCLOUD_CLUSTER_HOSTS=0
for host in $(host -s -t a $DOCKERCLOUD_SERVICE_HOSTNAME | awk '{print $NF}'); do
echo -n "waiting for $host to become available: " >&2
while test $[$TRY_UNTIL-$(date +%s)] -gt 0; do
if ping -q -w 1 -c 1 $host >/dev/null 2>&1; then
echo "ok" >&2
let DOCKERCLOUD_CLUSTER_HOSTS+=1
DOCKERCLOUD_ARGS+=( --join $host )
break
else
echo -n "." >&2
fi
done
done
if [ $DOCKERCLOUD_CLUSTER_HOSTS -lt 2 ]; then
echo "seems like we are running in single node mode" >&2
echo "only one node started or cluster discovery timed-out" >&2
fi
fi
#[ -n "$DOCKERCLOUD_ARGS" ] && DOCKERCLOUD_ARGS+=( --bind all )
set -- rethinkdb "$@" "${DOCKERCLOUD_ARGS[@]}"
fi

exec "$@"
24 changes: 24 additions & 0 deletions ubuntu/utopic/2.2.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM ubuntu:utopic

MAINTAINER Anastas Dancha <[email protected]>

ENV RETHINKDB_PACKAGE_VERSION 2.2.4

# Add the RethinkDB repository and public key
# "RethinkDB Packaging <[email protected]>" http://download.rethinkdb.com/apt/pubkey.gpg
RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 1614552E5765227AEC39EFCFA7E00EF33A8F2399 && \
echo "deb http://download.rethinkdb.com/apt utopic main" > /etc/apt/sources.list.d/rethinkdb.list && \
apt-get update && \
apt-get install -y rethinkdb=$RETHINKDB_PACKAGE_VERSION* && \
apt-get install -y --no-install-recommends bind9-host && \
rm -rf /var/lib/apt/lists/*

COPY docker-entrypoint.sh /entrypoint.sh

VOLUME ["/data"]
WORKDIR /data
# process cluster webui
EXPOSE 28015 29015 8080
ENTRYPOINT ["/entrypoint.sh"]
CMD ["--bind","all"]

32 changes: 32 additions & 0 deletions ubuntu/utopic/2.2.4/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash
set -e

if [ ${#} -eq 0 ] || [ "${1:0:1}" = '-' ]; then
[ -n "$DOCKERCLOUD_CONTAINER_FQDN" ] && DOCKERCLOUD_ARGS+=( --canonical-address $DOCKERCLOUD_CONTAINER_FQDN )
[ -n "$DOCKERCLOUD_IP_ADDRESS" ] && DOCKERCLOUD_ARGS+=( --canonical-address ${DOCKERCLOUD_IP_ADDRESS%/*} )
if [ -n "$DOCKERCLOUD_SERVICE_HOSTNAME" ]; then
TRY_UNTIL=$(date +%s -d "+ 30 seconds")
DOCKERCLOUD_CLUSTER_HOSTS=0
for host in $(host -s -t a $DOCKERCLOUD_SERVICE_HOSTNAME | awk '{print $NF}'); do
echo -n "waiting for $host to become available: " >&2
while test $[$TRY_UNTIL-$(date +%s)] -gt 0; do
if ping -q -w 1 -c 1 $host >/dev/null 2>&1; then
echo "ok" >&2
let DOCKERCLOUD_CLUSTER_HOSTS+=1
DOCKERCLOUD_ARGS+=( --join $host )
break
else
echo -n "." >&2
fi
done
done
if [ $DOCKERCLOUD_CLUSTER_HOSTS -lt 2 ]; then
echo "seems like we are running in single node mode" >&2
echo "only one node started or cluster discovery timed-out" >&2
fi
fi
#[ -n "$DOCKERCLOUD_ARGS" ] && DOCKERCLOUD_ARGS+=( --bind all )
set -- rethinkdb "$@" "${DOCKERCLOUD_ARGS[@]}"
fi

exec "$@"

0 comments on commit d88634f

Please sign in to comment.