Browse Source

Adjust build steps for ci

David Burke 2 years ago
parent
commit
6bb2cf6b8c
2 changed files with 3 additions and 3 deletions
  1. 1 1
      .gitlab-ci.yml
  2. 2 2
      Dockerfile

+ 1 - 1
.gitlab-ci.yml

@@ -91,4 +91,4 @@ build_arm_x86:
     - echo "Build version $VERSION ci registry image $CI_REGISTRY_IMAGE commit ref $CI_COMMIT_REF_NAME"
     - docker login -u ${DOCKER_CI_REGISTRY_USER} -p ${DOCKER_CI_REGISTRY_PASSWORD}
     - docker buildx create --use
-    - docker buildx build --platform linux/arm64/v8,linux/amd64 --push -t ${DOCKER_CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME} -t ${DOCKER_CI_REGISTRY_IMAGE}:latest --build-arg IS_CI="True" --build-arg GLITCHTIP_VERSION=$VERSION .
+    - docker buildx build --platform linux/arm64/v8,linux/amd64 --push -t ${DOCKER_CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME} -t ${DOCKER_CI_REGISTRY_IMAGE}:latest --build-arg IS_CI="True" --build-arg GLITCHTIP_VERSION=$VERSION --build-arg COLLECT_STATIC="True" .

+ 2 - 2
Dockerfile

@@ -1,7 +1,5 @@
 FROM python:3.10 as build-python
 ARG IS_CI
-ARG GLITCHTIP_VERSION=local
-ENV GLITCHTIP_VERSION ${GLITCHTIP_VERSION}
 ENV PYTHONUNBUFFERED=1 \
   PORT=8080 \
   POETRY_VIRTUALENVS_CREATE=false \
@@ -13,6 +11,8 @@ COPY poetry.lock pyproject.toml /code/
 RUN poetry install --no-interaction --no-ansi $(test "$IS_CI" = "True" && echo "--no-dev")
 
 FROM python:3.10-slim
+ARG GLITCHTIP_VERSION=local
+ENV GLITCHTIP_VERSION ${GLITCHTIP_VERSION}
 ENV PYTHONUNBUFFERED=1 \
   PORT=8080