Skip to content

Commit

Permalink
Merge branch 'main' of github.com:walt-id/waltid-idpkit
Browse files Browse the repository at this point in the history
  • Loading branch information
severinstampler committed Apr 13, 2023
2 parents 01149a7 + 61be050 commit dfc89fb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY . /appbuild
VOLUME /home/gradle/.gradle

RUN if [ -z "$SKIP_TESTS" ]; \
then echo "* Running full build" && gradle -i clean build installDist -x test; \
then echo "* Running full build" && gradle -i clean build installDist; \
else echo "* Building but skipping tests" && gradle -i clean installDist -x test; \
fi

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion web/waltid-idpkit-ui/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export default {
modules: [
// https://go.nuxtjs.dev/bootstrap
'bootstrap-vue/nuxt',
'@nuxtjs/axios'
'@nuxtjs/axios',
"@nuxtjs/proxy"
],

// Build Configuration: https://go.nuxtjs.dev/config-build
Expand Down

0 comments on commit dfc89fb

Please sign in to comment.