diff options
Diffstat (limited to 'docker-compose')
| -rw-r--r-- | docker-compose/README.md | 6 | ||||
| -rw-r--r-- | docker-compose/application.yml | 80 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yml | 4 |
3 files changed, 3 insertions, 87 deletions
diff --git a/docker-compose/README.md b/docker-compose/README.md index e443bdf2eb..3e9cd63169 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -34,7 +34,7 @@ It starts both Postgres database and CPS services. 2. Execute following command from `docker-compose` folder: ```bash -VERSION=x.y.z-SNAPSHOT DB_HOST=dbpostgresql DB_USERNAME=cps DB_PASSWORD=cps docker-compose up -d +VERSION=x.y.z-SNAPSHOT DB_USERNAME=cps DB_PASSWORD=cps docker-compose up -d ``` ## Running or debugging Java built code @@ -56,8 +56,7 @@ Following command starts the application using JAR file: ```bash DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps \ - java -classpath cps-application/target/cps-application-x.y.z-SNAPSHOT.jar:docker-compose \ - org.springframework.boot.loader.JarLauncher + java -jar cps-application/target/cps-application-x.y.z-SNAPSHOT.jar ``` ### Running from IntelliJ IDE @@ -66,7 +65,6 @@ Here are the steps to run or debug the application from Intellij: 1. Enable the desired maven profile form Maven Tool Window 2. Run a configuration from `Run -> Edit configurations` with following settings: - * `Working directory`: docker-compose folder, e.g. `$ProjectFileDir$/docker-compose` * `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps` ## Accessing services diff --git a/docker-compose/application.yml b/docker-compose/application.yml deleted file mode 100644 index d9b9e7c38d..0000000000 --- a/docker-compose/application.yml +++ /dev/null @@ -1,80 +0,0 @@ -# ============LICENSE_START=======================================================
-# Modification (C) 2021 Nordix Foundation
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-server:
- port: 8080
-
-rest:
- api:
- cps-base-path: /cps/api
- ncmp-base-path: /cps-ncmp/api
-
-spring:
- main:
- banner-mode: "off"
- jpa:
- ddl-auto: create
- open-in-view: false
- properties:
- hibernate:
- enable_lazy_load_no_trans: true
- dialect: org.hibernate.dialect.PostgreSQLDialect
-
- datasource:
- url: jdbc:postgresql://${DB_HOST}:5432/cpsdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driverClassName: org.postgresql.Driver
- initialization-mode: always
-
- cache:
- type: caffeine
- cache-names: yangSchema
- caffeine:
- spec: maximumSize=10000,expireAfterAccess=10m
-
- liquibase:
- change-log: classpath:changelog/changelog-master.yaml
- labels: ${LIQUIBASE_LABELS}
-
-security:
- # comma-separated uri patterns which do not require authorization
- permit-uri: /manage/health/**,/manage/info,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
- auth:
- username: ${CPS_USERNAME:cpsuser}
- password: ${CPS_PASSWORD:cpsr0cks!}
-
-# Actuator
-management:
- endpoints:
- web:
- base-path: /manage
- exposure:
- include: info,health,loggers
- endpoint:
- health:
- show-details: always
- # kubernetes probes: liveness and readiness
- probes:
- enabled: true
- loggers:
- enabled: true
-
-logging:
- level:
- org:
- springframework: INFO
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 4da74584c4..0cd49512a9 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -52,12 +52,10 @@ services: cps-and-ncmp: container_name: cps-and-ncmp image: cps-and-ncmp:${VERSION} - volumes: - - "./application.yml:/app/resources/application.yml" ports: - "8883:8080" environment: - DB_HOST: ${DB_HOST} + DB_HOST: dbpostgresql DB_USERNAME: ${DB_USERNAME} DB_PASSWORD: ${DB_PASSWORD} restart: unless-stopped |