FIX docker compose and push image on docker hub

consiglionazionaledellericerche · May 17, 2023 · d5a954b · d5a954b
1 parent 76e45e2
commit d5a954b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4,737 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -44,6 +44,19 @@ maven-install:
     - master
     - tags
 
+#Ad ogni nuovo tag viene fatta la push sul docker hub.
+docker-build-push-hub:
+  stage: build
+  script:
+    - docker build -t $CI_PROJECT_NAME:$CI_COMMIT_REF_NAME .
+    - docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASSWORD
+    - docker tag $CI_PROJECT_NAME:$CI_COMMIT_REF_NAME $DOCKER_HUB_ORGANIZATION/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+    - docker tag $CI_PROJECT_NAME:$CI_COMMIT_REF_NAME $DOCKER_HUB_ORGANIZATION/$CI_PROJECT_NAME:latest
+    - docker push $DOCKER_HUB_ORGANIZATION/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+    - docker push $DOCKER_HUB_ORGANIZATION/$CI_PROJECT_NAME:latest
+  only:
+    - tags
+
 #Ad ogni nuovo commit sul master viene fatta la push sul docker registry locale.
 docker-build-push-master:
   stage: build

diff --git a/docker-compose.yml.tpl b/docker-compose.yml.tpl
@@ -17,8 +17,8 @@ services:
       -Dmaven.wagon.http.ssl.insecure=true
       -Dmaven.wagon.http.ssl.allowall=true
       -Dace.signing.key='NDh5dm5vcTQ2Nm41b2tud3ZqcDU='
-      -Djava.security.egd=file:/dev/./urandom -jar /opt/missioni.war --spring.profiles.active=dev,cnr,keycloak,swagger
+      -Djava.security.egd=file:/dev/./urandom -jar /opt/missioni.war --spring.config.location=classpath:config/application.yml,file:/opt/application-cnr.yml,classpath:config/application-keycloak.yml --spring.profiles.active=dev,cnr,keycloak,swagger
     volumes:
-    - ./application-prod.yml:/opt/application-prod.yml
+    - ./application-dev.yml:/opt/application-cnr.yml
     labels:
       SERVICE_NAME: "##{SERVICE_NAME}##"