Skip to content

Commit

Permalink
Merge pull request #485 from OpenCatalogi/development
Browse files Browse the repository at this point in the history
Development to main
  • Loading branch information
remko48 authored Aug 16, 2024
2 parents 0a72852 + 3eab4af commit e544734
Show file tree
Hide file tree
Showing 62 changed files with 7,165 additions and 2,379 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ jobs:
- name: Print definitive APP_ENV
run: echo "APP_ENV is now $APP_ENV and APP_BUILD is now $APP_BUILD"
- name: Build the Docker image
run: docker-compose build --build-arg APP_ENV=$APP_ENV --build-arg APP_BUILD=$APP_BUILD --build-arg APP_BUILD_ALL_FIXTURES=true
run: docker compose build --build-arg APP_ENV=$APP_ENV --build-arg APP_BUILD=$APP_BUILD --build-arg APP_BUILD_ALL_FIXTURES=true
- name: Run the docker image
run: docker-compose up -d
run: docker compose up -d
- name: Taking some sleep (for containers to come up)
run: sleep 20
- name: Check if all containers are running
run: docker ps
- name: Dumping the logs
run: docker-compose logs
run: docker compose logs
- name: Show all images
run: docker images
- name: Login to Container Registry
Expand All @@ -76,13 +76,13 @@ jobs:
fi
- if: steps.containerregistry-login.outputs.success == 'true' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/development' || github.ref == 'refs/heads/refinement-demo')
name: Push to Container Registry
run: docker-compose push
run: docker compose push

- if: steps.containerregistry-login.outputs.success == 'true' && github.ref == 'refs/heads/master'
name: Push versioned containers to Container Registry
id: version-push
run: |
images=$(docker-compose images -q | xargs docker inspect --format='{{ index .RepoTags 0}}' | cut -d':' -f1 | grep $APP_NAME)
images=$(docker compose images -q | xargs docker inspect --format='{{ index .RepoTags 0}}' | cut -d':' -f1 | grep $APP_NAME)
for image in $images
do
docker push "${image}":"${APP_BUILD}"
Expand All @@ -106,4 +106,4 @@ jobs:
prerelease: false
- name: Chores
if: (success() || failure())
run: docker-compose down
run: docker compose down
4 changes: 4 additions & 0 deletions pwa/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ module.exports = {
pathname: "/github/[md]",
crumbLabel: "Markdown file",
},
{
pathname: "/publications/[publicationId]",
crumbLabel: "Publication",
},
],
},
},
Expand Down
Loading

0 comments on commit e544734

Please sign in to comment.