Commit e21a4256 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branches 'buster' and 'master' of... 

Merge branches 'buster' and 'master' of https://git.unicaen.fr/open-source/docker/unicaen-image into buster
parents 8394ae4c 8febac2b

.gitlab-ci.yml

0 → 100644
+65 −0
Original line number Diff line number Diff line 
before_script:

  - docker info



stages:

  - build



build5.6:

  stage: build

  script:

    - export HTTP_PROXY=http://proxy.unicaen.fr:3128

    - export PHP_VERSION=5.6

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} --build-arg OCI8_PACKAGE="oci8-2.0.12" -t unicaen-dev-php${PHP_VERSION}-apache .

    - docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache



build7.0:

  stage: build

  script:

    - export HTTP_PROXY=http://proxy.unicaen.fr:3128

    - export PHP_VERSION=7.0

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t unicaen-dev-php${PHP_VERSION}-apache .

    - docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache



build7.1:

  stage: build

  script:

    - export HTTP_PROXY=http://proxy.unicaen.fr:3128

    - export PHP_VERSION=7.1

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t unicaen-dev-php${PHP_VERSION}-apache .

    - docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache



build7.2:

  stage: build

  script:

    - export HTTP_PROXY=http://proxy.unicaen.fr:3128

    - export PHP_VERSION=7.2

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t unicaen-dev-php${PHP_VERSION}-apache .

    - docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache



build7.3:

  stage: build

  script:

    - export HTTP_PROXY=http://proxy.unicaen.fr:3128

    - export PHP_VERSION=7.3

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t unicaen-dev-php${PHP_VERSION}-apache .

    - docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t open-source/docker/unicaen-image:php${PHP_VERSION} .

    - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}

    - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}



build7.4:

  stage: build

  script:

    - export HTTP_PROXY=http://proxy.unicaen.fr:3128

    - export PHP_VERSION=7.4

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t unicaen-dev-php${PHP_VERSION}-apache .

    - docker tag unicaen-dev-php${PHP_VERSION}-apache registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker push registre.unicaen.fr:5000/unicaen-dev-php${PHP_VERSION}-apache

    - docker build --rm --build-arg PHP_VERSION=${PHP_VERSION} --build-arg HTTP_PROXY=${HTTP_PROXY} -t open-source/docker/unicaen-image:php${PHP_VERSION} .

    - docker tag open-source/docker/unicaen-image:php${PHP_VERSION} registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}

    - docker push registre.unicaen.fr:5000/open-source/docker/unicaen-image:php${PHP_VERSION}

Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ RUN apt-get -qq update && \ 
        memcached \

        libmemcached-tools \

        netcat-openbsd \

        php-pear \

        php${PHP_VERSION} \

        php${PHP_VERSION}-bcmath \

        php${PHP_VERSION}-curl \

Dockerfile.sh

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ apt -qq update && \ 
        memcached \

        libmemcached-tools \

        netcat-openbsd \

        php-pear \

        php-dev \

        php${PHP_VERSION} \

        php${PHP_VERSION}-bcmath \

        php${PHP_VERSION}-curl \

README.md

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ composer install 


### Exec 



- Lancement d'une commande dans un container démarré, exemple :

- Lancement d'une commande dans un container déjà démarré, exemple :



```bash

docker exec \