Skip to content
Snippets Groups Projects
Commit e01985a7 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Undo changes to force linux32 because introduces to build child images

Remove obsolete inherited readme
Add platform in build command linux/386 to remove warning
parent d597b450
Branches
No related tags found
No related merge requests found
Pipeline #1703 passed
Pipeline: dev-docker-tools

#1707

    Pipeline: dev-docker-tools

    #1706

      Pipeline: dev-docker-tools

      #1705

        +1
        ...@@ -18,10 +18,7 @@ RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Europe/Paris /etc/localti ...@@ -18,10 +18,7 @@ RUN rm -rf /etc/localtime && ln -s /usr/share/zoneinfo/Europe/Paris /etc/localti
        && yum -y groupinstall "Development Tools" \ && yum -y groupinstall "Development Tools" \
        # Install system cmake and sudo # Install system cmake and sudo
        && yum -y install cmake cmake3 sudo \ && yum -y install cmake cmake3 sudo \
        && yum clean all --enablerepo='*' \ && yum clean all --enablerepo='*'
        && rm /bin/sh \
        && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \
        && chmod +x /bin/sh
        ENTRYPOINT ["linux32", "--"] ENTRYPOINT ["linux32", "--"]
        ......
        # dev-el6-gcc44-x86
        Docker container image based on official CentOS 6 32 bits image with development tools
        - gcc version 4.4.7 20120313 (Red Hat 4.4.7-23) (GCC)
        - cmake version 2.8.12.2
        - cmake3 version 3.6.1
        ## Build image
        ```
        docker build -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 .
        ```
        If proxy issue
        ```
        docker build --build-arg http_proxy=http://proxy.synchrotron-soleil.fr:8080 --build-arg https_proxy=http://proxy.synchrotron-soleil.fr:8080 -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 .
        ```
        ## Example of usage
        ```
        $ git clone git@gitlab.synchrotron-soleil.fr:software-control-system/sandbox/cmake-catch1-hello.git
        ...
        $ docker run --rm -it --user $UID -v $(pwd):/data gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
        bash-4.2$ cd /data
        bash-4.2$ cmake3 -H. -Bbuild
        ...
        bash-4.2$ cmake3 --build build
        ...
        bash-4.2$ build/unit_tests
        ...
        bash-4.2$ build/unit_tests -r xml
        ...
        bash-4.2$ build/SayHello
        Hello World
        ```
        # dev-el6-gcc44
        Docker container image based on official CentOS 6 image with development tools
        - gcc version 4.4.7 20120313 (Red Hat 4.4.7-23) (GCC)
        - cmake version 2.8.12.2
        - cmake3 version 3.6.1
        ## Build image
        ```
        docker build -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 .
        ```
        If proxy issue
        ```
        docker build --build-arg http_proxy=http://proxy.synchrotron-soleil.fr:8080 --build-arg https_proxy=http://proxy.synchrotron-soleil.fr:8080 -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 .
        ```
        ## Example of usage
        ```
        $ git clone git@gitlab.synchrotron-soleil.fr:software-control-system/sandbox/cmake-catch1-hello.git
        ...
        $ docker run --rm -it --user $UID -v $(pwd):/data gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
        bash-4.2$ cd /data
        bash-4.2$ cmake3 -H. -Bbuild
        ...
        bash-4.2$ cmake3 --build build
        ...
        bash-4.2$ build/unit_tests
        ...
        bash-4.2$ build/unit_tests -r xml
        ...
        bash-4.2$ build/SayHello
        Hello World
        ```
        ...@@ -18,7 +18,7 @@ before_script: ...@@ -18,7 +18,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        # dev-el6-gcc73-x86
        Docker container image based on official CentOS 6 image with development tools
        - gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
        - cmake version 2.8.12.2
        - cmake3 version 3.6.1
        ## Build image
        ### To build image with docker-compose
        ```
        docker-compose build dev-el6-gcc73-x86
        ```
        ### To build image without docker-compose
        ```
        docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --platform=linux/386 -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc73-x86 .
        ```
        # Launch
        ### To launch with docker-compose
        ```
        $ docker-compose run --rm dev-el6-gcc73-x86
        ```
        ### To launch without docker-compose
        ```
        $ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc73-x86 .
        ```
        ### To launch containers in detached mode with docker-compose
        To launch the containers
        ```
        $ docker-compose up -d dev-el6-gcc73-x86
        ```
        To connect into the container
        ```
        $ docker exec -it dev-el6-gcc73-x86 linux32 bash
        ```
        ...@@ -18,7 +18,7 @@ before_script: ...@@ -18,7 +18,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        ...@@ -18,7 +18,7 @@ before_script: ...@@ -18,7 +18,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        ...@@ -19,7 +19,7 @@ before_script: ...@@ -19,7 +19,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        # dev-el7-gcc48-x86
        Docker container image based on official CentOS 7 32 bits image with development tools
        - gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC)
        - cmake version 2.8.12.2
        - cmake3 version 3.17.5
        ## Build image
        ```
        docker build -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 .
        ```
        If proxy issue
        ```
        docker build --build-arg http_proxy=http://proxy.synchrotron-soleil.fr:8080 --build-arg https_proxy=http://proxy.synchrotron-soleil.fr:8080 -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 .
        ```
        ## Example of usage
        ```
        $ git clone git@gitlab.synchrotron-soleil.fr:software-control-system/sandbox/cmake-catch1-hello.git
        ...
        $ docker run --rm -it --user $UID -v $(pwd):/data gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
        bash-4.2$ cd /data
        bash-4.2$ cmake3 -H. -Bbuild
        ...
        bash-4.2$ cmake3 --build build
        ...
        bash-4.2$ build/unit_tests
        ...
        bash-4.2$ build/unit_tests -r xml
        ...
        bash-4.2$ build/SayHello
        Hello World
        ```
        # dev-el7-gcc48
        Docker container image based on official CentOS 7 image with development tools
        - gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC)
        - cmake version 2.8.12.2
        - cmake3 version 3.17.5
        ## Build image
        ```
        docker build -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 .
        ```
        If proxy issue
        ```
        docker build --build-arg http_proxy=http://proxy.synchrotron-soleil.fr:8080 --build-arg https_proxy=http://proxy.synchrotron-soleil.fr:8080 -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 .
        ```
        ## Example of usage
        ```
        $ git clone git@gitlab.synchrotron-soleil.fr:software-control-system/sandbox/cmake-catch1-hello.git
        ...
        $ docker run --rm -it --user $UID -v $(pwd):/data gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
        bash-4.2$ cd /data
        bash-4.2$ cmake3 -H. -Bbuild
        ...
        bash-4.2$ cmake3 --build build
        ...
        bash-4.2$ build/unit_tests
        ...
        bash-4.2$ build/unit_tests -r xml
        ...
        bash-4.2$ build/SayHello
        Hello World
        ```
        ...@@ -18,7 +18,7 @@ before_script: ...@@ -18,7 +18,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        # dev-el7-gcc73-x86
        Docker container image based on official CentOS 7 image with development tools
        - gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
        - cmake version 2.8.12.2
        - cmake3 version 3.6.1
        ## Build image
        ### To build image with docker-compose
        ```
        docker-compose build dev-el7-gcc73-x86
        ```
        ### To build image without docker-compose
        ```
        docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --platform=linux/386 -t gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86 .
        ```
        # Launch
        ### To launch with docker-compose
        ```
        $ docker-compose run --rm dev-el7-gcc73-x86
        ```
        ### To launch without docker-compose
        ```
        $ docker run --rm -ti -e http_proxy -e https_proxy -e no_proxy --platform=linux/386 gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc73-x86
        ```
        ### To launch containers in detached mode with docker-compose
        To launch the containers
        ```
        $ docker-compose up -d dev-el7-gcc73-x86
        ```
        To connect into the container
        ```
        $ docker exec -it dev-el7-gcc73-x86 linux32 bash
        ```
        ...@@ -18,7 +18,7 @@ before_script: ...@@ -18,7 +18,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        ...@@ -18,7 +18,7 @@ before_script: ...@@ -18,7 +18,7 @@ before_script:
        build: build:
        stage: build stage: build
        script: script:
        - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker build --pull -t ${CONTAINER_TEST_IMAGE} --platform=linux/386 -f ${NAME}/Dockerfile .
        - docker push ${CONTAINER_TEST_IMAGE} - docker push ${CONTAINER_TEST_IMAGE}
        test: test:
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment