10.1.26-r0 release

Update mariadb to 10.1.26.

bitnami/mariadb/10.1/Dockerfile

@@ -1,17 +1,15 @@
-FROM bitnami/minideb-extras:jessie-r19
+FROM bitnami/minideb-extras:jessie-r21
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-
-
 # Install required system packages and dependencies
 RUN install_packages libaio1 libc6 libgcc1 libjemalloc1 libncurses5 libssl1.0.0 libstdc++6 libtinfo5 zlib1g
-RUN bitnami-pkg unpack mariadb-10.1.25-0 --checksum 599b1e6d9c3984e65fe1ee7fa7f884250cff9c589360b89bb33e91ea91404092
+RUN bitnami-pkg unpack mariadb-10.1.26-0 --checksum e4a2e2adc6a4c3b5bab04f0c756d0d15955ef5960b37cce11fdb764014383df8
 
 COPY rootfs /
 
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="mariadb" \
-    BITNAMI_IMAGE_VERSION="10.1.25-r0" \
+    BITNAMI_IMAGE_VERSION="10.1.26-r0" \
     MARIADB_DATABASE="" \
     MARIADB_MASTER_HOST="" \
     MARIADB_MASTER_PORT_NUMBER="" \
@@ -27,9 +25,6 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     MARIADB_USER="" \
     PATH="/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH"
 
-
-
-
 EXPOSE 3306
 
 ENTRYPOINT ["/app-entrypoint.sh"]

bitnami/mariadb/README.md

@@ -488,6 +488,13 @@ or using Docker Compose:
 $ docker-compose start mariadb
 ```
 
+# Useful Links
+
+- [Create An AMP Development Environment With Bitnami Containers
+](https://docs.bitnami.com/containers/how-to/create-amp-environment-containers/)
+- [Create An EMP Development Environment With Bitnami Containers
+](https://docs.bitnami.com/containers/how-to/create-emp-environment-containers/)
+
 # Notable Changes
 
 ## 10.1.24-r2

bitnami/mariadb/circle.yml

@@ -1,32 +1,56 @@
-machine:
-  services:
-  - docker
+version: 2
+jobs:
+  build:
+    working_directory: /workdir
+    docker:
+      - image: docker:17.06.0-ce-git
         environment:
-    RELEASE_SERIES_LIST: 10.1
-    LATEST_STABLE: 10.1
+          RELEASE_SERIES_LIST: "10.1"
+          LATEST_STABLE: "10.1"
           IMAGE_NAME: mariadb
-    CHART_NAME:
+          CHART_NAME: mariadb
           CHART_REPO: https://github.com/kubernetes/charts
           DOCKER_PROJECT: bitnami
           QUAY_PROJECT: bitnami
           GCLOUD_PROJECT: bitnami-containers
 
-dependencies:
-  override:
-  - docker info
-  - gcloud version
-  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-pull-cache.sh | bash -
-
-test:
-  override:
-  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 17.06.0-ce
+      - run:
+          name: Install dependencies
+          command: |
+            apk add --no-cache curl bash coreutils
+      - run:
+          name: Docker info
+          command: |
+            docker version
+            docker info
+      - restore_cache:
+          keys:
+            - cache-{{ .Branch }}
+          paths:
+            - /cache/layers.tar
+      - run:
+          name: Build docker image
+          command: |
+            curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
+      - save_cache:
+          key: cache-{{ .Branch }}-{{ epoch }}
+          paths:
+            - /cache/layers.tar
+      - deploy:
+          name: Publish docker image
+          command: |
+            if [ -n "${CIRCLE_TAG}" ]; then
+              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
+            elif [ "${CIRCLE_BRANCH}" == "master" ]; then
+              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-development-image.sh | bash -
+            fi
 
 deployment:
-  development:
-    branch: master
-    commands:
-    - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-development-image.sh | bash -
   release:
     tag: /^[0-9].*-r[0-9]+$/
     commands:
-    - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
+      - echo "workaround make tags run in 2.0 - https://discuss.circleci.com/t/git-tag-deploys-in-2-0/9493/8"