From 4845552560ed59079f4814602ef0b003ed6d0319 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 09:42:19 -0400 Subject: [PATCH 1/8] new dockerfile for ubuntu 18.04 Signed-off-by: Kenneth Reitz --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4bab57e2..ccf35a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,7 @@ -FROM ubuntu:17.10 +FROM ubuntu:18.04 # -- Install Pipenv: -RUN apt-get update \ - && apt-get install software-properties-common python-software-properties -y \ - && add-apt-repository ppa:pypa/ppa -y \ - && apt-get update \ - && apt-get install git pipenv -y +RUN apt update && apt install python3-pip -y && pip3 install pipenv ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 From 1f495db5095822d3b2793685eddcde0af5f9e7ed Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 09:54:27 -0400 Subject: [PATCH 2/8] docker-compose based tests Signed-off-by: Kenneth Reitz --- .buildkite/pipeline.yml | 2 +- Dockerfile.tests | 23 +++++++++++++++++++++++ Makefile | 3 +++ docker-compose.yml | 9 +++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Dockerfile.tests create mode 100644 Makefile create mode 100644 docker-compose.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 48175a72..9274f481 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,4 +1,4 @@ steps: - label: ":python:" commands: - - ./run-tests.sh \ No newline at end of file + - make \ No newline at end of file diff --git a/Dockerfile.tests b/Dockerfile.tests new file mode 100644 index 00000000..5ffc78d8 --- /dev/null +++ b/Dockerfile.tests @@ -0,0 +1,23 @@ +FROM ubuntu:18.04 + +# -- Install Pipenv: +RUN apt update && apt install python-pip python3-pip -y && pip3 install pipenv + +ENV LC_ALL C.UTF-8 +ENV LANG C.UTF-8 + +# -- Install Application into container: +RUN set -ex && mkdir /app + +WORKDIR /pipenv + +# -------------------- +# - Using This File: - +# -------------------- + +# FROM kennethreitz/pipenv + +# COPY . /app + +# -- Replace with the correct path to your app's main executable +# CMD python3 main.py diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..25b48eb8 --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +test: + docker-compose build + docker-compose up \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..663c4fc0 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3' +services: + pipenv-tests: + build: + context: . + dockerfile: Dockerfile.tests + command: bash /pipenv/run-tests.sh + volumes: + - .:/pipenv From 86aee384e1a82162013a4f61baf631749bea4667 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 09:57:10 -0400 Subject: [PATCH 3/8] also build time Signed-off-by: Kenneth Reitz --- Dockerfile.tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tests b/Dockerfile.tests index 5ffc78d8..1b235af4 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,7 +1,7 @@ FROM ubuntu:18.04 # -- Install Pipenv: -RUN apt update && apt install python-pip python3-pip -y && pip3 install pipenv +RUN apt update && apt install python-pip python3-pip time -y && pip3 install pipenv ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 From 439c0089cbd68f4221f2d50e8d1bd7cbbe0b1faa Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 10:02:54 -0400 Subject: [PATCH 4/8] also install git Signed-off-by: Kenneth Reitz --- Dockerfile.tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tests b/Dockerfile.tests index 1b235af4..01f6f207 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,7 +1,7 @@ FROM ubuntu:18.04 # -- Install Pipenv: -RUN apt update && apt install python-pip python3-pip time -y && pip3 install pipenv +RUN apt update && apt install python-pip python3-pip time git -y && pip3 install pipenv ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 From 0343454988bdcee45a198480cb525528a6d63a66 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 10:12:00 -0400 Subject: [PATCH 5/8] pipenv-tests Signed-off-by: Kenneth Reitz --- Dockerfile.tests | 23 ----------------------- docker-compose.yml | 4 +--- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 Dockerfile.tests diff --git a/Dockerfile.tests b/Dockerfile.tests deleted file mode 100644 index 01f6f207..00000000 --- a/Dockerfile.tests +++ /dev/null @@ -1,23 +0,0 @@ -FROM ubuntu:18.04 - -# -- Install Pipenv: -RUN apt update && apt install python-pip python3-pip time git -y && pip3 install pipenv - -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 - -# -- Install Application into container: -RUN set -ex && mkdir /app - -WORKDIR /pipenv - -# -------------------- -# - Using This File: - -# -------------------- - -# FROM kennethreitz/pipenv - -# COPY . /app - -# -- Replace with the correct path to your app's main executable -# CMD python3 main.py diff --git a/docker-compose.yml b/docker-compose.yml index 663c4fc0..1fede25a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,7 @@ version: '3' services: pipenv-tests: - build: - context: . - dockerfile: Dockerfile.tests + image: kennethreitz/pipenv-tests command: bash /pipenv/run-tests.sh volumes: - .:/pipenv From 4361cf7f3a4aba42555ffc965494ee95776b298b Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 10:25:30 -0400 Subject: [PATCH 6/8] empty commit From c2495dcd995d8bbe833c634de7e5aa91483de7bf Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 10:33:54 -0400 Subject: [PATCH 7/8] update makefile Signed-off-by: Kenneth Reitz --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 25b48eb8..51b267c5 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,2 @@ test: - docker-compose build docker-compose up \ No newline at end of file From 92290cb2f6486400bc2e47867bbe26bab3f9ceef Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 20 May 2018 10:35:13 -0400 Subject: [PATCH 8/8] stick to traditional tests for now Signed-off-by: Kenneth Reitz --- .buildkite/pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9274f481..46b2e799 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,4 +1,5 @@ steps: - label: ":python:" commands: - - make \ No newline at end of file + # - make + - ./run-tests.sh \ No newline at end of file