File tree Expand file tree Collapse file tree 2 files changed +7
-15
lines changed Expand file tree Collapse file tree 2 files changed +7
-15
lines changed Original file line number Diff line number Diff line change @@ -10,19 +10,11 @@ services:
1010 - docker
1111
1212install :
13- - sed -e 's/${CHECK_CODE}/'${CHECK_CODE}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl > Dockerfile
13+ - echo "FROM ${DOCKER_IMAGE}" > Dockerfile
1414 - docker-compose build
1515
1616script :
1717 - docker-compose run $(bash <(curl -s https://codecov.io/env)) tests
1818
1919env :
20- - PG_VERSION=10 CHECK_CODE=clang
21- - PG_VERSION=9.6 CHECK_CODE=clang
22- - PG_VERSION=9.5 CHECK_CODE=clang
23- - PG_VERSION=10 CHECK_CODE=cppcheck
24- - PG_VERSION=9.6 CHECK_CODE=cppcheck
25- - PG_VERSION=9.5 CHECK_CODE=cppcheck
26- - PG_VERSION=10 CHECK_CODE=false
27- - PG_VERSION=9.6 CHECK_CODE=false
28- - PG_VERSION=9.5 CHECK_CODE=false
20+ - DOCKER_IMAGE=pg95_clang_check_code
Original file line number Diff line number Diff line change @@ -23,8 +23,8 @@ RUN mkdir -p /pg/data && \
2323 chmod a+rwx /usr/local/lib/postgresql && \
2424 chmod a+rwx /usr/local/share/postgresql/extension
2525
26- ADD . /pg/pg_pathman
27- WORKDIR /pg/pg_pathman
28- RUN chmod -R go+rwX /pg/pg_pathman
29- USER postgres
30- ENTRYPOINT PGDATA=${PGDATA} CHECK_CODE=${CHECK_CODE} bash run_tests.sh
26+ ONBUILD ADD . /pg/pg_pathman
27+ ONBUILD WORKDIR /pg/pg_pathman
28+ ONBUILD RUN chmod -R go+rwX /pg/pg_pathman
29+ ONBUILD USER postgres
30+ ONBUILD ENTRYPOINT PGDATA=${PGDATA} CHECK_CODE=${CHECK_CODE} bash run_tests.sh
You can’t perform that action at this time.
0 commit comments