diff --git a/application/executable/pom.xml b/application/executable/pom.xml index eb16a0b..a646e6a 100644 --- a/application/executable/pom.xml +++ b/application/executable/pom.xml @@ -80,6 +80,11 @@ link-embed-impl + + dev.sheldan.abstracto.modules + webservices-impl + + dev.sheldan.abstracto.modules starboard-impl diff --git a/application/executable/src/main/resources/application-local.properties b/application/executable/src/main/resources/application-local.properties index d926b4c..a69cee8 100644 --- a/application/executable/src/main/resources/application-local.properties +++ b/application/executable/src/main/resources/application-local.properties @@ -16,4 +16,6 @@ log4j.logger.org.hibernate.type=trace management.metrics.tags.application=oneplus-bot spring.security.user.name=abstracto spring.security.user.password=password -spring.security.user.roles=USER \ No newline at end of file +spring.security.user.roles=USER + +spring.application.name=OnePlusBot \ No newline at end of file diff --git a/application/executable/src/main/resources/application.properties b/application/executable/src/main/resources/application.properties index 986b872..17d308d 100644 --- a/application/executable/src/main/resources/application.properties +++ b/application/executable/src/main/resources/application.properties @@ -6,4 +6,6 @@ spring.quartz.jdbc.initialize-schema=never management.metrics.tags.application=oneplus-bot spring.security.user.name= ${REST_USER_NAME} spring.security.user.password= ${REST_PASSWORD} -spring.security.user.roles=USER \ No newline at end of file +spring.security.user.roles=USER + +spring.application.name=OnePlusBot \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env index fe788e0..24c3e81 100644 --- a/deployment/docker-compose/src/main/resources/.env +++ b/deployment/docker-compose/src/main/resources/.env @@ -24,4 +24,5 @@ PGADMIN_PORT=5050 # default authentication for pg admin PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev PGADMIN_DEFAULT_PASSWORD=admin -TOKEN= \ No newline at end of file +TOKEN= +YOUTUBE_API_KEY= \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/docker-compose.yml b/deployment/docker-compose/src/main/resources/docker-compose.yml index b7b08ff..b866bf9 100644 --- a/deployment/docker-compose/src/main/resources/docker-compose.yml +++ b/deployment/docker-compose/src/main/resources/docker-compose.yml @@ -50,6 +50,7 @@ services: DB_NAME: ${DATABASE_NAME} REST_USER_NAME: ${REST_USER_NAME} REST_PASSWORD: ${REST_PASSWORD} + YOUTUBE_API_KEY: ${YOUTUBE_API_KEY} command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh" ports: - "${DEBUG_PORT}:5005" diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 4d7d236..2f113ed 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -89,6 +89,16 @@ utility.zip + f + dev.sheldan.abstracto-templates.templates + webservices + ${abstracto.templates.version} + zip + true + ${file.basedir}/deployment/template-artifacts/ + webservices.zip + + dev.sheldan.oneplus.bot.templates.modules starboard-custom-templates @@ -145,6 +155,7 @@ ${file.basedir}/deployment/translation-artifacts/ starboard.zip + dev.sheldan.abstracto-templates.translations utility @@ -155,6 +166,16 @@ utility.zip + + dev.sheldan.abstracto-templates.translations + webservices + ${abstracto.templates.version} + zip + true + ${file.basedir}/deployment/translation-artifacts/ + webservices.zip + + dev.sheldan.oneplus.bot.templates.translations starboard-custom @@ -244,6 +265,17 @@ utility.zip + + dev.sheldan.abstracto.modules + webservices-impl + ${abstracto.version} + liquibase + zip + true + ${file.basedir}/deployment/liquibase-artifacts/ + webservices.zip + + dev.sheldan.oneplus.bot.application.custom starboard-custom diff --git a/deployment/image-packaging/src/main/docker/deployment/Dockerfile b/deployment/image-packaging/src/main/docker/deployment/Dockerfile index b59ceea..3a793ea 100644 --- a/deployment/image-packaging/src/main/docker/deployment/Dockerfile +++ b/deployment/image-packaging/src/main/docker/deployment/Dockerfile @@ -1,6 +1,6 @@ -ARG ABSTRACTO_REGISTRY_PREFIX= +ARG ABSTRACTO_REGISTRY_PREFIX ARG ABSTRACTO_VERSION=latest -FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION} +FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION:-latest} MAINTAINER Sheldan ADD template-artifacts /templates ADD translation-artifacts /translations diff --git a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json index 369f2e2..5234852 100644 --- a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json +++ b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json @@ -1,12 +1,13 @@ { - "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"], - "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"], + "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"], + "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"], "liquibase_artifacts": [ { "zip": "scheduling", "file": "scheduling-changeLog.xml" }, { "zip": "core", "file": "core-changeLog.xml" }, { "zip": "utility", "file": "utility-changeLog.xml"}, { "zip": "entertainment", "file": "entertainment-changeLog.xml"}, { "zip": "link-embed", "file": "link-embed-changeLog.xml"}, + { "zip": "webservices", "file": "webservices-changeLog.xml"}, { "zip": "starboard", "file": "starboard-changeLog.xml"}, { "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"} ] diff --git a/pom.xml b/pom.xml index 9cdd19b..a043cfa 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ 1.8 1.8 - 1.2.4 - 1.2.1 + 1.2.5 + 1.2.2