Skip to content

Commit c289bda

Browse files
authored
create coverage data in monorepo-friendly way (#1178)
1 parent 86ce2fb commit c289bda

File tree

4 files changed

+18
-20
lines changed

4 files changed

+18
-20
lines changed

.coveragerc

-2
This file was deleted.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ test_env.install_cli:
205205

206206
test_env.container_prepare:
207207
apt-get -y install git build-essential netcat-traditional
208-
git config --global --add safe.directory /app || true
208+
git config --global --add safe.directory /app/apps/codecov-api || true
209209

210210
test_env.container_check_db:
211211
while ! nc -vz postgres 5432; do sleep 1; echo "waiting for postgres"; done

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
- redis
99
- timescale
1010
volumes:
11-
- ./:/app
11+
- ./:/app/apps/codecov-api
1212
- ./docker/test.yml:/config/codecov.yml
1313
entrypoint:
1414
- ./dev.sh

docker/Dockerfile

+16-16
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ARG BERGLAS_VERSION=2.0.6
66
FROM us-docker.pkg.dev/berglas/berglas/berglas:$BERGLAS_VERSION as berglas
77

88
FROM $REQUIREMENTS_IMAGE as app
9-
COPY . /app
10-
WORKDIR /app
9+
COPY . /app/apps/codecov-api
10+
WORKDIR /app/apps/codecov-api
1111
RUN pip install setuptools==71.1.0
1212
RUN python manage.py collectstatic --no-input
1313

@@ -25,27 +25,27 @@ RUN pip uninstall -y typing
2525
ENV DJANGO_SETTINGS_MODULE="codecov.settings_enterprise"
2626
# Remove the settings dev and enterprise files.
2727
# These should *never* make it to enterprise.
28-
RUN rm /app/codecov/settings_dev.py && \
29-
rm /app/codecov/settings_prod.py && \
30-
rm /app/codecov/settings_test.py && \
31-
rm /app/codecov/settings_staging.py && \
32-
rm /app/dev.sh && \
33-
rm /app/migrate.sh && \
34-
rm /app/prod.sh && \
35-
rm /app/staging.sh && \
36-
rm /app/production.yml && \
37-
rm /app/development.yml
28+
RUN rm /app/apps/codecov-api/codecov/settings_dev.py && \
29+
rm /app/apps/codecov-api/codecov/settings_prod.py && \
30+
rm /app/apps/codecov-api/codecov/settings_test.py && \
31+
rm /app/apps/codecov-api/codecov/settings_staging.py && \
32+
rm /app/apps/codecov-api/dev.sh && \
33+
rm /app/apps/codecov-api/migrate.sh && \
34+
rm /app/apps/codecov-api/prod.sh && \
35+
rm /app/apps/codecov-api/staging.sh && \
36+
rm /app/apps/codecov-api/production.yml && \
37+
rm /app/apps/codecov-api/development.yml
3838
# Remove unneeded folders
39-
RUN rm -rf /app/.github
40-
RUN rm -rf /app/.circleci
39+
RUN rm -rf /app/apps/codecov-api/.github
40+
RUN rm -rf /app/apps/codecov-api/.circleci
4141
# Create the codecov user to run the container as
4242
RUN addgroup --system application \
4343
&& adduser --system codecov --ingroup application --home /home/codecov
4444
RUN mkdir -p /config && chown codecov:application /config
4545
# copy the enterprise settings module.
46-
WORKDIR /app
46+
WORKDIR /app/apps/codecov-api
4747
RUN chmod +x enterprise.sh && \
48-
chown codecov:application /app
48+
chown codecov:application /app/apps/codecov-api
4949
ARG RELEASE_VERSION
5050
ENV RUN_ENV="ENTERPRISE"
5151
ENV RELEASE_VERSION=$RELEASE_VERSION

0 commit comments

Comments
 (0)