From eba782006e49f109084c8ff0b7e9dd9da003aba0 Mon Sep 17 00:00:00 2001 From: Dantali0n <info@dantalion.nl> Date: Thu, 28 Sep 2023 16:52:07 +0200 Subject: [PATCH] Install docker in the base image --- docker/ci-runner/Dockerfile | 3 ++- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 6 +++--- {{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/ci-runner/Dockerfile b/docker/ci-runner/Dockerfile index 937fe86..8b96217 100644 --- a/docker/ci-runner/Dockerfile +++ b/docker/ci-runner/Dockerfile @@ -1,4 +1,5 @@ FROM python:3.11 RUN python -m pip install --upgrade pip -RUN pip install --upgrade cookiecutter tox twine +RUN pip install --upgrade cookiecutter tox twine cibuildwheel==2.13.1 cookiecutter +RUN curl -sSL https://get.docker.com/ | sh diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 5d15cbf..1498ae3 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -79,14 +79,14 @@ run_unit_tests_coverage: package_files: stage: package - image: python:3.8 +# image: python:3.8 artifacts: expire_in: 1w paths: - dist/* script: - - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.13.1 cookiecutter +# - curl -sSL https://get.docker.com/ | sh +# - python -m pip install cibuildwheel==2.13.1 cookiecutter - cibuildwheel --platform linux --output-dir dist package_docs: diff --git a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile index 01d5ee1..54b2c9c 100644 --- a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile +++ b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile @@ -1,4 +1,4 @@ FROM python:3.11 RUN python -m pip install --upgrade pip -RUN pip install --upgrade tox twine +RUN pip install --upgrade tox twine cibuildwheel==2.13.1 -- GitLab