From 938a10b5c353b8d518ea0cef0937eec7d87f7dcc Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 24 Aug 2021 10:26:09 -0700 Subject: [PATCH 1/4] contract-migration ci parity --- apps/contract-migration/docker/Dockerfile_ci | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/contract-migration/docker/Dockerfile_ci b/apps/contract-migration/docker/Dockerfile_ci index 4f384a87..53ba732c 100644 --- a/apps/contract-migration/docker/Dockerfile_ci +++ b/apps/contract-migration/docker/Dockerfile_ci @@ -26,6 +26,7 @@ RUN echo Install confini schema files && \ cp -v *.ini $CONFINI_DIR COPY requirements.txt . +COPY override_requirements.txt . ARG pip_index_url=https://pypi.org/simple ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" @@ -37,5 +38,12 @@ RUN pip install --index-url https://pypi.org/simple \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ -r requirements.txt +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url https://pypi.org/simple \ + --force-reinstall \ + --trusted-host $pip_trusted_host \ + --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ + -r override_requirements.txt + COPY . . RUN chmod +x *.sh From 2a24ce6938a9403dae73e07e0b7ccc017fb5333f Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 24 Aug 2021 10:33:53 -0700 Subject: [PATCH 2/4] remove mount --- apps/contract-migration/docker/Dockerfile_ci | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/contract-migration/docker/Dockerfile_ci b/apps/contract-migration/docker/Dockerfile_ci index 53ba732c..23861bb7 100644 --- a/apps/contract-migration/docker/Dockerfile_ci +++ b/apps/contract-migration/docker/Dockerfile_ci @@ -38,8 +38,7 @@ RUN pip install --index-url https://pypi.org/simple \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ -r requirements.txt -RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ - pip install --index-url https://pypi.org/simple \ +RUN pip install --index-url https://pypi.org/simple \ --force-reinstall \ --trusted-host $pip_trusted_host \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ From aa2f363b273b14613352d403a50a9d26973f5150 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 24 Aug 2021 10:42:30 -0700 Subject: [PATCH 3/4] fix em --- apps/contract-migration/docker/Dockerfile | 8 -------- apps/contract-migration/docker/Dockerfile_ci | 13 ++++--------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index b6db65bc..665f4299 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -16,14 +16,6 @@ RUN mkdir -vp /usr/local/etc/cic ENV CONFINI_DIR /usr/local/etc/cic/ #RUN mkdir -vp $CONFINI_DIR -#ARG cic_config_commit=24287fb253196820f23ff8a7177b122f2cd99a11 -#ARG cic_config_url=https://gitlab.com/grassrootseconomics/cic-config.git/ -#RUN echo Install confini schema files && \ -# git clone --depth 1 $cic_config_url cic-config && \ -# cd cic-config && \ -# git fetch --depth 1 origin $cic_config_commit && \ -# git checkout $cic_config_commit && \ -# cp -v *.ini $CONFINI_DIR COPY config_template/ /usr/local/etc/cic/ COPY requirements.txt . diff --git a/apps/contract-migration/docker/Dockerfile_ci b/apps/contract-migration/docker/Dockerfile_ci index 23861bb7..aac0338f 100644 --- a/apps/contract-migration/docker/Dockerfile_ci +++ b/apps/contract-migration/docker/Dockerfile_ci @@ -16,26 +16,21 @@ RUN mkdir -vp /usr/local/etc/cic ENV CONFINI_DIR /usr/local/etc/cic/ RUN mkdir -vp $CONFINI_DIR -ARG cic_config_commit=0abe0867f18077907c7023bf0ef5e466a3984dd8 -ARG cic_config_url=https://gitlab.com/grassrootseconomics/cic-config.git/ -RUN echo Install confini schema files && \ - git clone --depth 1 $cic_config_url cic-config && \ - cd cic-config && \ - git fetch --depth 1 origin $cic_config_commit && \ - git checkout $cic_config_commit && \ - cp -v *.ini $CONFINI_DIR +COPY config_template/ /usr/local/etc/cic/ COPY requirements.txt . COPY override_requirements.txt . ARG pip_index_url=https://pypi.org/simple ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" +ARG EXTRA_PIP_ARGS="" ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple" ARG pip_trusted_host=pypi.org RUN pip install --index-url https://pypi.org/simple \ + pip install --index-url https://pypi.org/simple \ --force-reinstall \ --trusted-host $pip_trusted_host \ - --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \ + --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS\ -r requirements.txt RUN pip install --index-url https://pypi.org/simple \ From 1b0ee269d0d2f159ff350b4c08b9bb2972e05e00 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Tue, 24 Aug 2021 11:43:39 -0700 Subject: [PATCH 4/4] add pre tag to contract-migration --- apps/contract-migration/docker/Dockerfile | 3 +++ apps/contract-migration/docker/Dockerfile_ci | 2 ++ 2 files changed, 5 insertions(+) diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 665f4299..48f9860c 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -28,13 +28,16 @@ ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages ARG pip_trusted_host=pypi.org RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ pip install --index-url https://pypi.org/simple \ + --pre \ --force-reinstall \ --trusted-host $pip_trusted_host \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ -r requirements.txt + RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ pip install --index-url https://pypi.org/simple \ --force-reinstall \ + --pre \ --trusted-host $pip_trusted_host \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ -r override_requirements.txt diff --git a/apps/contract-migration/docker/Dockerfile_ci b/apps/contract-migration/docker/Dockerfile_ci index aac0338f..e533a29b 100644 --- a/apps/contract-migration/docker/Dockerfile_ci +++ b/apps/contract-migration/docker/Dockerfile_ci @@ -28,6 +28,7 @@ ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages ARG pip_trusted_host=pypi.org RUN pip install --index-url https://pypi.org/simple \ pip install --index-url https://pypi.org/simple \ + --pre \ --force-reinstall \ --trusted-host $pip_trusted_host \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS\ @@ -35,6 +36,7 @@ RUN pip install --index-url https://pypi.org/simple \ RUN pip install --index-url https://pypi.org/simple \ --force-reinstall \ + --pre \ --trusted-host $pip_trusted_host \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ -r override_requirements.txt