diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index dbac3c4..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,46 +0,0 @@ -image: docker:latest - -stages: -- test -- build - -variables: - VERSION: php55 - 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 - - chmod 500 init - - chmod 644 10-default.conf - - 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 - - php55 - - php56 - - php70 diff --git a/Dockerfile b/Dockerfile index 5921327..f56dd1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,8 @@ 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 @@ -63,6 +65,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"