From 7e0e3fea0bb865ee75a9ff3177e71e205b51b997 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 25 May 2017 22:16:56 +1000
Subject: [PATCH] Re-enabled CI, added php-opcache

---
 .gitlab-ci.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile     |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..e72a793
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,45 @@
+image: docker:latest
+
+stages:
+- test
+- build
+
+variables:
+  VERSION: php70
+  DOCKER_IMAGE: leenooks/lamps
+  DOCKER_REGISTRY: registry.leenooks.net
+  DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
+
+services:
+- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
+
+before_script:
+- docker info
+- docker version
+- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
+
+test:
+  stage: test
+  script:
+  - cat /etc/hosts
+  - env|sort
+  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
+  - docker images
+  only:
+  - debug
+
+build:
+  stage: build
+  script:
+  - chmod 600 .my.cnf sshd_config
+  - chmod 500 init
+  - chmod 644 *-default.conf sshd
+  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
+  - docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
+  - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
+  tags:
+  - docker
+  only:
+  - php55
+  - php56
+  - php70
diff --git a/Dockerfile b/Dockerfile
index d513fcd..6adafc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,7 @@ RUN yum -y install --enabler remi-php70 \
 	php-pdo \
 	php-xml \
 	php-composer-installers.noarch \
+	php-opcache \
 	m4 \
 	opendkim \
 	sendmail \