diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 6454678fe8..673bad15cb 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest needs: - doc_generation - container: 'antaresrte/rte-antares:centos7-simulator' + container: 'antaresrte/rte-antares:centos7-simulator-no-deps' strategy: matrix: ortools-xpress: [ON, OFF] @@ -48,7 +48,7 @@ jobs: run: | git submodule update --init --recursive src/antares-deps src/tests/resources/Antares_Simulator_Tests - - name: Get antares-deps + - name: Download & extract precompiled deps at root run: | ANTARES_DEPS_VERSION=$(cut -d'"' -f4 antares-deps-version.json | grep -Ev '\{|\}') cd / diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000000..906693e951 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,24 @@ +name: Publish docker images +on: + push: + branches: + - 'docker/*' + +jobs: + docker_publish: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@master + + - name: Docker file push + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: antaresrte/rte-antares + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + workdir: docker + dockerfile: centos7-basic-requirements + cache: true + tags: centos7-simulator-no-deps diff --git a/docker/centos7-basic-requirements b/docker/centos7-basic-requirements index 376b507ea3..5e6516d020 100644 --- a/docker/centos7-basic-requirements +++ b/docker/centos7-basic-requirements @@ -1,7 +1,5 @@ FROM centos:7 -ARG ANTARES_DEPS_VERSION - # Install requirements : update repo RUN yum update -y @@ -10,8 +8,8 @@ RUN yum install -y epel-release # Install requirements RUN yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils rpm-build &&\ - yum install -y cmake3 devtoolset-9 ccache &&\ - yum install -y rh-git227-git + yum install -y cmake3 devtoolset-9 &&\ + yum install -y rh-git227-git ccache # Install simulator requirements RUN yum install -y unzip libuuid-devel wxGTK3-devel boost-test boost-devel @@ -19,4 +17,4 @@ RUN yum install -y unzip libuuid-devel wxGTK3-devel boost-test boost-devel # Add python and pip installation RUN yum install -y python3-pip &&\ python3 -m pip install --upgrade pip &&\ - pip3 install pytest pytest-xdist numpy pandas \ No newline at end of file + pip3 install pytest numpy pandas \ No newline at end of file