Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-20 23:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

updated to mariadb-10.1.12-0

Browse Source 
Notable Changes:
 - root password is optional
This commit is contained in:
Sameer Naik
2016-04-07 17:03:45 +05:30
parent 1842fdca84
commit 1c3f150987
2 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bitnami/mariadb/Dockerfile
View File

@@ -2,32 +2,22 @@ FROM gcr.io/stacksmith-images/ubuntu:14.04-r05
MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_APP_NAME=mariadb \
BITNAMI_APP_USER=mysql \
BITNAMI_APP_VERSION=10.1.11-0 \
MARIADB_PACKAGE_SHA256="59cb45e66e7b9b3697296cca8ad8c988ddc089016fef94b7133587cb838c8505"
BITNAMI_APP_VERSION=10.1.12-0 \
BITNAMI_APP_USER=mysql
ENV BITNAMI_APP_DIR=/opt/bitnami/$BITNAMI_APP_NAME \
BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
ENV PATH=$BITNAMI_APP_DIR/sbin:$BITNAMI_APP_DIR/bin:$PATH
RUN bitnami-pkg unpack $BITNAMI_APP_NAME-$BITNAMI_APP_VERSION
# these symlinks should be setup by harpoon at unpack
RUN mkdir -p $BITNAMI_APP_VOL_PREFIX && \
ln -s $BITNAMI_APP_DIR/data $BITNAMI_APP_VOL_PREFIX/data && \
ln -s $BITNAMI_APP_DIR/conf $BITNAMI_APP_VOL_PREFIX/conf && \
ln -s $BITNAMI_APP_DIR/logs $BITNAMI_APP_VOL_PREFIX/logs
# temporary fix for mysql client
RUN mkdir $BITNAMI_APP_DIR/var && \
ln -sf $BITNAMI_APP_DIR/tmp $BITNAMI_APP_DIR/var/mysql
RUN bitnami-pkg install base-functions-1.0.0-2 --checksum 9789082a1e01a4411198136477723288736d5ad5990403a208423b39369c8aac
RUN bitnami-pkg unpack mariadb-10.1.12-0 --checksum 98e45fb19b8087496b0be614bf5c2cf9d849f7d828984ff85e4aa941692d1d35
COPY rootfs/ /
EXPOSE 3306
VOLUME ["$BITNAMI_APP_VOL_PREFIX/data"]
VOLUME ["$BITNAMI_APP_VOL_PREFIX"]
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["harpoon", "start", "--foreground", "mariadb"]

15
bitnami/mariadb/rootfs/app-entrypoint.sh
View File

@@ -1,21 +1,14 @@
#!/bin/bash
set -e
chown $BITNAMI_APP_USER: $BITNAMI_APP_VOL_PREFIX || true
if [[ "$1" == "harpoon" && "$2" == "start" ]]; then
status=`harpoon inspect $BITNAMI_APP_NAME`
if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
harpoon initialize $BITNAMI_APP_NAME --password ${MARIADB_PASSWORD:-password}
## disable DNS lookups
# this should happen in harpoon initialize, controlled by a argument, eg. --skip-name-resolve
(
echo ""
echo "[mysqld]"
echo "skip-name-resolve"
) >> $BITNAMI_APP_DIR/conf/my.cnf
harpoon initialize $BITNAMI_APP_NAME \
${MARIADB_PASSWORD:+--password $MARIADB_PASSWORD}
fi
chown -R $BITNAMI_APP_USER: $BITNAMI_APP_DIR/data || true
fi
exec /entrypoint.sh "$@"