From ae899e4a6674edf33591fbedd529665f911560aa Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 2 Aug 2017 18:52:31 +0000
Subject: [PATCH] 8.3.6-r0 release

Update drupal to 8.3.6.
---
 bitnami/drupal/8/Dockerfile | 17 +++------
 bitnami/drupal/circle.yml   | 76 ++++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/bitnami/drupal/8/Dockerfile b/bitnami/drupal/8/Dockerfile
index 51d19e706cb9..bc6b1be7a384 100644
--- a/bitnami/drupal/8/Dockerfile
+++ b/bitnami/drupal/8/Dockerfile
@@ -1,23 +1,21 @@
-FROM bitnami/minideb-extras:jessie-r19
+FROM bitnami/minideb-extras:jessie-r20
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-
-
 # Install required system packages and dependencies
 RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g
-RUN bitnami-pkg unpack apache-2.4.26-0 --checksum 2d01547a273e715388bae110707a41f458b5092193d31e6b726b5527a56a1eac
-RUN bitnami-pkg unpack php-7.0.20-0 --checksum 78181d1320567be07448e75e4783ce0269b433fc9e7ed8eff67abcff7f7327e9
+RUN bitnami-pkg unpack apache-2.4.27-0 --checksum 27b8591b6564856428e2a3480949d549316e2f7e5bd207faa7b8c6e3a9bb9cc0
+RUN bitnami-pkg unpack php-7.0.21-0 --checksum d3430bea08625b740b7b38222c31c06717b163b1e2c439b03ec845dc1c67b3da
 RUN bitnami-pkg install mysql-client-10.1.25-0 --checksum 513ef36ab1efa5570332547c2027ae29886fe4bb56472de11ca083423a3fe366
-RUN bitnami-pkg install libphp-7.0.20-0 --checksum 9ec5ab2093723889e8c90e9e34f7434939c0c8d2ea054b4fc5af68e21f6ebaa5
+RUN bitnami-pkg install libphp-7.0.21-0 --checksum 6962e432f76e6d9101590863b257be54ea1a3e2bf0c6dde1b243f23350794a61
 RUN bitnami-pkg install drush-8.1.12-0 --checksum f38554d1f7a7fad55457d82f7cb233e72ad0f8b102d06d97eadee52a83215296
-RUN bitnami-pkg unpack drupal-8.3.5-0 --checksum 2c4208fe0ae5333540e60e5b5ea4889e7617a19ba95a514fe3d54abc97b92fe4
+RUN bitnami-pkg unpack drupal-8.3.6-0 --checksum 4d49856d2c2f95a0444de654d75c20631fe9ba6495a89864c66d8cdfd9bdbff9
 
 COPY rootfs /
 
 ENV APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.3.5-r0" \
+    BITNAMI_IMAGE_VERSION="8.3.6-r0" \
     DRUPAL_EMAIL="user@example.com" \
     DRUPAL_PASSWORD="bitnami" \
     DRUPAL_USERNAME="user" \
@@ -27,9 +25,6 @@ ENV APACHE_HTTPS_PORT_NUMBER="443" \
     MARIADB_USER="root" \
     PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:/opt/bitnami/drush:$PATH"
 
-
-
-
 EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
diff --git a/bitnami/drupal/circle.yml b/bitnami/drupal/circle.yml
index 8da243967087..0ebafa43134a 100644
--- a/bitnami/drupal/circle.yml
+++ b/bitnami/drupal/circle.yml
@@ -1,32 +1,56 @@
-machine:
-  services:
-  - docker
-  environment:
-    RELEASE_SERIES_LIST: 8
-    LATEST_STABLE: 8
-    IMAGE_NAME: drupal
-    CHART_NAME: drupal
-    CHART_REPO: https://github.com/kubernetes/charts
-    DOCKER_PROJECT: bitnami
-    QUAY_PROJECT: bitnami
-    GCLOUD_PROJECT: bitnami-containers
+version: 2
+jobs:
+  build:
+    working_directory: /workdir
+    docker:
+      - image: docker:17.06.0-ce-git
+        environment:
+          RELEASE_SERIES_LIST: "8"
+          LATEST_STABLE: "8"
+          IMAGE_NAME: drupal
+          CHART_NAME: drupal
+          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"