diff --git a/.dockerignore b/.dockerignore index 10c82bf..b19aa41 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ /target -/.cargo -/.rustup +/debian +/rhel diff --git a/.gitignore b/.gitignore index d9375fa..5b45791 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /target Cargo.lock -/.cargo -/.rustup +/debian +/rhel diff --git a/Dockerfile b/Dockerfile.debian similarity index 100% rename from Dockerfile rename to Dockerfile.debian diff --git a/Makefile b/Makefile index 1f5d18d..b253a6b 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ DOCKER_IMAGE=ca-injector-test -DOCKER_RUN=docker run -e RUST_BACKTRACE=full -it --rm -v ${PWD}:/root/ca_injector -v ${PWD}/.rustup:/root/.rustup -v ${PWD}/.cargo:/root/.cargo ${DOCKER_IMAGE} +DOCKER_RUN_DEBIAN=docker run -e RUST_BACKTRACE=full -it --rm -v ${PWD}:/root/ca_injector -v ${PWD}/debian/.rustup:/root/.rustup -v ${PWD}/debian/.cargo:/root/.cargo ${DOCKER_IMAGE}:debian test: build - mkdir -p .cargo .rustup - ${DOCKER_RUN} + mkdir -p debian rhel + ${DOCKER_RUN_DEBIAN} build: - docker build -t ${DOCKER_IMAGE} . + docker build -f Dockerfile.debian -t ${DOCKER_IMAGE}:debian .