Skip to content

Commit

Permalink
Avoid underscores in docker images names and tags
Browse files Browse the repository at this point in the history
  • Loading branch information
ponceta authored May 15, 2024
1 parent e85dab5 commit 414623d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/datamodel-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ jobs:
--build-arg RUN_TEST=True \
--build-arg PSYCOPG_VERSION=${{ matrix.psycopg-version }} \
-f datamodel/.docker/Dockerfile \
--tag teksi/district_heating:unstable .
--tag teksi/district-heating:unstable .
- name: Initialize container
run: |
docker run -d -p 5432:5432 --name teksi-district_heating teksi/district_heating:unstable
docker exec teksi-district_heating init_db.sh wait
docker run -d -p 5432:5432 --name teksi-district-heating teksi/district-heating:unstable
docker exec teksi-district-heating init_db.sh wait
- name: Run tests
run: docker exec teksi-district_heating pytest datamodel
run: docker exec teksi-district-heating pytest datamodel

- name: Docker logs
if: failure()
run: docker logs teksi-district_heating
run: docker logs teksi-district-heating

static-tests:
name: Run static tests on datamodel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
make gettext
- name: tx pull
if: ${{ github.event.pull_request.head.repo.full_name == 'teksi/district_heating' }}
if: ${{ github.event.pull_request.head.repo.full_name == 'teksi/district-heating' }}
env:
TX_TOKEN: ${{ secrets.TX_TOKEN }}
working-directory: docs
Expand Down
10 changes: 5 additions & 5 deletions datamodel/scripts/run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ done
shift "$(($OPTIND -1))"

if [[ $BUILD -eq 1 ]]; then
docker build --build-arg RUN_TEST=True -f datamodel/.docker/Dockerfile --tag teksi/district_heating .
docker build --build-arg RUN_TEST=True -f datamodel/.docker/Dockerfile --tag teksi/district-heating .
fi

docker rm -f teksi-district_heating
docker run -d -p ${TDH_PG_PORT}:5432 -v $(pwd):/src --name teksi-district_heating teksi/district_heating -c log_statement=all
docker exec teksi-district_heating init_db.sh wait
docker rm -f teksi-district-heating
docker run -d -p ${TDH_PG_PORT}:5432 -v $(pwd):/src --name teksi-district-heating teksi/district-heating -c log_statement=all
docker exec teksi-district-heating init_db.sh wait
if [[ $DEMO_DATA -eq 1 ]]; then
docker exec teksi-district_heating init_db.sh build -d
docker exec teksi-district-heating init_db.sh build -d
fi
2 changes: 1 addition & 1 deletion plugin/scripts/download-interlis-libs.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash

wget https://github.com/teksi/district_heating/archive/refs/tags/plugin-ili-libs-1.tar.gz
wget https://github.com/teksi/district-heating/archive/refs/tags/plugin-ili-libs-1.tar.gz
tar xvzf plugin-ili-libs-1.tar.gz --strip-components=1

0 comments on commit 414623d

Please sign in to comment.