diff --git a/bitnami/dokuwiki/0/ol-7/Dockerfile b/bitnami/dokuwiki/0/ol-7/Dockerfile index 790f26dae029..a756c9b5c020 100644 --- a/bitnami/dokuwiki/0/ol-7/Dockerfile +++ b/bitnami/dokuwiki/0/ol-7/Dockerfile @@ -1,4 +1,4 @@ -FROM bitnami/oraclelinux-extras:7-r53 +FROM bitnami/oraclelinux-extras:7-r56 LABEL maintainer "Bitnami " # Install required system packages and dependencies @@ -12,7 +12,7 @@ COPY rootfs / ENV APACHE_HTTPS_PORT_NUMBER="443" \ APACHE_HTTP_PORT_NUMBER="80" \ BITNAMI_APP_NAME="dokuwiki" \ - BITNAMI_IMAGE_VERSION="0.20180422.201805030840-ol-7-r35" \ + BITNAMI_IMAGE_VERSION="0.20180422.201805030840-ol-7-r36" \ DOKUWIKI_EMAIL="user@example.com" \ DOKUWIKI_FULL_NAME="Full Name" \ DOKUWIKI_PASSWORD="bitnami1" \ diff --git a/bitnami/dokuwiki/README.md b/bitnami/dokuwiki/README.md index e75daa2b85a9..5a306a33a0a1 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -28,7 +28,7 @@ $ docker-compose up -d > NOTE: Debian 8 images have been deprecated in favor of Debian 9 images. Bitnami will not longer publish new Docker images based on Debian 8. -* [`0-ol-7`, `0.20180422.201805030840-ol-7-r35` (0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/0.20180422.201805030840-ol-7-r35/0/ol-7/Dockerfile) +* [`0-ol-7`, `0.20180422.201805030840-ol-7-r36` (0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/0.20180422.201805030840-ol-7-r36/0/ol-7/Dockerfile) * [`0-debian-9`, `0.20180422.201805030840-debian-9-r22`, `0`, `0.20180422.201805030840`, `0.20180422.201805030840-r22`, `latest` (0/Dockerfile)](https://github.com/bitnami/bitnami-docker-dokuwiki/blob/0.20180422.201805030840-debian-9-r22/0/Dockerfile) Subscribe to project updates by watching the [bitnami/dokuwiki GitHub repo](https://github.com/bitnami/bitnami-docker-dokuwiki). diff --git a/bitnami/dokuwiki/circle.yml b/bitnami/dokuwiki/circle.yml index a8d7e5eb698e..16dedc157760 100644 --- a/bitnami/dokuwiki/circle.yml +++ b/bitnami/dokuwiki/circle.yml @@ -33,35 +33,17 @@ jobs: 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 - workflows: version: 2 build-and-deploy: jobs: - build: filters: - branches: - only: /.*/ tags: only: /^.*(?