diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index aa2fdb4..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,28 +0,0 @@ -stages: - - build -variables: - CONTAINER_REGISTRY: "https://prykhodkofsatfstateregistry.azurecr.io" - DOCKER_REPOSITORY: "prykhodkofsatfstateregistry.azurecr.io" - IMAGE_NAME: "fsa-backend" - DOCKER_DRIVER: overlay2 - DOCKER_HOST: tcp://127.0.0.1:2375 - DOCKER_TLS_VERIFY: "" - DOCKER_TLS_CERTDIR: "" -build_image: - stage: build - tags: - - fsa-prykhodko - image: docker:dind - services: - - docker:latest - before_script: - - until docker info &>/dev/null ; do sleep 2 && echo "Testujem pripojenie na Docker deamon (dind)" ; done - - export IMAGE_VERSION="${CI_JOB_ID}-${CI_COMMIT_SHORT_SHA}" - script: - - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$CONTAINER_REGISTRY" - - docker build -t "$DOCKER_REPOSITORY/$IMAGE_NAME:$IMAGE_VERSION" -t "$DOCKER_REPOSITORY/$IMAGE_NAME:latest" . - - docker push "$DOCKER_REPOSITORY/$IMAGE_NAME:$IMAGE_VERSION" - - docker push "$DOCKER_REPOSITORY/$IMAGE_NAME:latest" - only: -# do not forget about branch name - - main \ No newline at end of file diff --git a/springboot/src/main/resources/application.yaml b/springboot/src/main/resources/application.yaml index 97a2dcf..e1322d8 100644 --- a/springboot/src/main/resources/application.yaml +++ b/springboot/src/main/resources/application.yaml @@ -1,16 +1,16 @@ spring: -# security: -# oauth2: -# resourceserver: -# jwt: -# issuer-uri: http://localhost:8082/realms/FSA -# jwk-set-uri: http://localhost:8082/realms/FSA/protocol/openid-connect/certs -# datasource: -# url: jdbc:postgresql://localhost:6969/windat_db -# username: admin -# password: admin -# driver-class-name: org.postgresql.Driver -# name: windat_db + security: + oauth2: + resourceserver: + jwt: + issuer-uri: http://localhost:8082/realms/WinDat + jwk-set-uri: http://localhost:8082/realms/WinDat/protocol/openid-connect/certs + datasource: + url: jdbc:postgresql://localhost:6969/windat_db + username: admin + password: admin + driver-class-name: org.postgresql.Driver + name: windat_db jpa: show-sql: false hibernate: