From fb0da36495228e85da59fb8612ac6dd4c9ea2160 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 25 Dec 2017 11:40:27 -0800 Subject: [PATCH] Add docker-compose for development environment --- Dockerfile.dev | 8 +++++--- docker-compose.yml | 12 +++--------- test/bats.sh => tests/test.bats | 0 3 files changed, 8 insertions(+), 12 deletions(-) rename test/bats.sh => tests/test.bats (100%) diff --git a/Dockerfile.dev b/Dockerfile.dev index 01a7ace..59a30f6 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -5,11 +5,13 @@ ENV PATH=/bin:$PATH WORKDIR /ssl RUN apk --no-cache --virtual .run-depends add \ + bash \ curl \ drill \ openssl -#COPY getsslD /bin/getsslD +COPY .bats-core/ /opt/bats/ -ENTRYPOINT [ "getsslD" ] -CMD [ "--help" ] +RUN ln -s /opt/bats/libexec/bats /usr/sbin/bats + +ENTRYPOINT ["/bin/ash"] diff --git a/docker-compose.yml b/docker-compose.yml index 69bc65b..4a9dc04 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,15 +4,9 @@ services: development: build: context: . + dockerfile: Dockerfile.dev + working_dir: /opt/src/getssld volumes: - .:/opt/src/getssld - - /tmp/testing:/ssl + - ./tests:/code entrypoint: /bin/ash - - bats: - build: - context: ../../bats-core/ - image: bats:latest - volumes: - - .:/code - command: /code/test/bats.sh diff --git a/test/bats.sh b/tests/test.bats similarity index 100% rename from test/bats.sh rename to tests/test.bats