Compare commits

...

6 Commits

Author SHA1 Message Date
Deon George
0c1db2507c Add lamp to apache group; Add VOLUME for ssh 2017-01-25 22:34:56 +11:00
Deon George
57107e688b Disabled gitlib runner built for improved container caching 2016-08-23 11:30:55 +10:00
Deon George
afb4b45f2a Updated permissions on COPY files 2016-08-23 09:59:32 +10:00
Deon George
47d542277f Updated gitlab runner php is 5.5 2016-08-11 12:31:46 +10:00
Deon George
807bb9ece2 Enabled runner to run on php55, php56 and php70 2016-08-11 12:22:11 +10:00
Deon George
3c65841ce6 Updated Dockerfile for php 5.5 from remi 2016-08-11 12:08:45 +10:00
2 changed files with 8 additions and 45 deletions

View File

@ -1,40 +0,0 @@
image: docker:latest
stages:
- test
- build
variables:
VERSION: php53
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:
- 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:
- master

View File

@ -1,5 +1,5 @@
# NAME leenooks/lamps
# VERSION php54
# VERSION php55
# BUILD docker build -t="leenooks/lamps" .
# START docker run -dp 80:80 [-p 443:443 ] -p 2022:22 \
# -e NO_MAIL=TRUE \
@ -24,8 +24,12 @@ FROM registry.leenooks.net/leenooks/base:7
RUN yum -y install epel-release && yum clean all
RUN yum -y install tsmpipe && yum clean all
RUN yum -y install http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && yum clean all && rm -rf /var/tmp/*
# EPEL & Leenooks packages
RUN yum -y install \
RUN yum -y install --enabler remi-php55 \
httpd \
mariadb-server \
php \
@ -52,8 +56,9 @@ COPY .my.cnf /root/
COPY 10-default.conf /etc/httpd/conf.d/
RUN ln -f /etc/.ln/httpd/conf.d/awstats.conf /etc/httpd/conf.d/awstats.conf && ln -f /etc/.ln/opendkim.conf /etc/opendkim.conf
RUN useradd -c "Hosting Admin User" -m lamp
RUN useradd -c "Hosting Admin User" -m lamp -G apache
VOLUME [ "/etc/ssh" ]
EXPOSE 80 443
# Starting
@ -61,6 +66,4 @@ COPY init /sbin/
ENTRYPOINT [ "/sbin/init" ]
CMD [ "start" ]
RUN yum -y install tsmpipe && yum clean all
RUN useradd -rc "Composer" -m composer -s /sbin/nologin && su composer -s /bin/bash -lc "composer global require laravel/installer && composer require --dev --no-update xethron/migrations-generator:dev-l5 && composer require --dev --no-update way/generators:dev-feature/laravel-five-stable && composer config repositories.repo-name git git@github.com:jamisonvalenta/Laravel-4-Generators.git"