Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jordimas committed Jul 27, 2023
1 parent e893edc commit 941193f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build:
- export DOCKER_PATH=docker/dockerfile-builder
- export REPO_NAME=$CI_REGISTRY_IMAGE/tmt-builder
- export IMAGE_NAME=$REPO_NAME:$CI_COMMIT_REF_NAME
- docker build --tag tmt-builder --tag $IMAGE_NAME . -f $DOCKER_PATH
- docker build --env TRANSIFEX_CFG=$TRANSIFEX_CFG --tag tmt-builder --tag $IMAGE_NAME . -f $DOCKER_PATH
- docker push $IMAGE_NAME

build-languagetool:
Expand Down
7 changes: 6 additions & 1 deletion docker/dockerfile-builder
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN apt-get update && apt-get install python3-dev libhunspell-dev libyaml-dev ge
RUN curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash && mv ./tx /usr/bin/
RUN mkdir -p $DIR

RUN if [[ -n "${TRANSIFEX_CFG}" ]]; then cp ${TRANSIFEX_CFG} ~/.transifexrc ; fi

#Pology
RUN apt-get install cmake -y
Expand All @@ -34,5 +33,11 @@ COPY source-pos/ $DIR_TMT_GIT/source-pos/
COPY cfg/ $DIR_TMT_GIT/cfg/
COPY docker/ $DIR_TMT_GIT/docker/
COPY integration-tests/ $DIR_TMT_GIT/integration-tests/

# Gitlab configuration
RUN echo "var: ${TRANSIFEX_CFG}"
RUN if [[ -n "${TRANSIFEX_CFG}" ]]; then cp ${TRANSIFEX_CFG} ~/.transifexrc ; fi


# What get's executed on Run
ENTRYPOINT bash $DIR_TMT_GIT/docker/entry-point-builder.sh $DIR $DIR_TMT_GIT
2 changes: 1 addition & 1 deletion docker/entry-point-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ DIR="$1" # root /srv/dev
DIR_TMT_GIT="$2" # /srv/dev/tm-git - working directory
PUBLISH_WEBDOCKER=/srv/web-docker
PRESERVE_CROSSEXECS=/srv/tmt-files

bash
# Run unit tests
cd $DIR_TMT_GIT
nose2
Expand Down

0 comments on commit 941193f

Please sign in to comment.