- Adopt official APIM docker image #447

Axway-API-Management-Plus · Dec 11, 2023 · 14bca70 · 14bca70
1 parent f5d7ffd
commit 14bca70
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 475 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -4,9 +4,10 @@ on: [push]
 
 env:
   CASSANDRA_DOCKER_IMAGE: cassandra:4.0.11
-  APIM_DOCKER_IMAGE: docker-registry.demo.axway.com/swagger-promote/api-mgr-with-policies:7.7-20231130
+  APIM_DOCKER_IMAGE: docker.repository.axway.com/apigateway-docker-prod/7.7/gateway:7.7.0.20231130-2-BN0052-ubi9
   CACHE_FILE_APIM: api-manager_7_7_20231130.cache.tar
   CACHE_FILE_CASSANDRA: cassandra_4_0_11.cache.tar
+  FED_FILE: swagger-promote-7.7-20231130.fed
   LOG_LEVEL: info
 
 jobs:
@@ -37,7 +38,7 @@ jobs:
         name: Login to Axway demo docker registry
         uses: docker/login-action@v2
         with:
-          registry: docker-registry.demo.axway.com
+          registry: docker.repository.axway.com
           username: ${{ secrets.AXWAY_DOCKER_REG_USER }}
           password: ${{ secrets.AXWAY_DOCKER_REG_PASS }}
       - if: steps.cache-docker.outputs.cache-hit != 'true'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,6 +12,9 @@ services:
     image: ${APIM_DOCKER_IMAGE}
     volumes:
       - ${GITHUB_WORKSPACE}/licenses:/opt/Axway/apigateway/conf/licenses
+      - ${GITHUB_WORKSPACE}/modules/apim-adapter/src/test/resources/apimanager/${FED_FILE}:/merge/fed
+      - ${GITHUB_WORKSPACE}/modules/apim-adapter/src/test/resources/apimanager/mandatoryFiles.yaml:/merge/mandatoryFiles
+      - ${GITHUB_WORKSPACE}/modules/apim-adapter/src/test/resources/apimanager/merge/apigateway:/merge/apigateway
     environment:
       - ACCEPT_GENERAL_CONDITIONS=yes
     ports:

diff --git a/modules/apim-adapter/src/test/resources/apimanager/buildDockerImage.sh b/modules/apim-adapter/src/test/resources/apimanager/buildDockerImage.sh
@@ -143,7 +143,7 @@ cp -v $testSources/runInstall.sh Dockerfiles/gateway-base/scripts/runInstall.sh
 echo "########### Create Base-Image        ###################"
 ./build_base_image.py --installer=../$installer --os=centos7 --out-image apigw-base:$version
 echo "########### Create API-Gateway-Image ###################"
-./build_gw_image.py --license=../multiple.lic --default-cert --fed=$testSources/$fedFile --merge-dir $testSources/merge-dir/apigateway --parent-image apigw-base:$version --out-image=docker-registry.demo.axway.com/swagger-promote/api-mgr-with-policies:$version
+./build_gw_image.py --license=../multiple.lic --default-cert --fed=$testSources/$fedFile --merge-dir $testSources/merge/apigateway --parent-image apigw-base:$version --out-image=docker-registry.demo.axway.com/swagger-promote/api-mgr-with-policies:$version
 
 echo "########### Push Image               ###################"
 docker push docker-registry.demo.axway.com/swagger-promote/api-mgr-with-policies:$version
diff --git a/modules/apim-adapter/src/test/resources/apimanager/mandatoryFiles.yaml b/modules/apim-adapter/src/test/resources/apimanager/mandatoryFiles.yaml
@@ -0,0 +1,4 @@
+required:
+    - /merge/apigateway/groups/emt-group/emt-service/conf/jvm.xml
+    - /merge/apigateway/webapps/apiportal/vordel/apiportal/app/app.config
+    - /merge/fed
diff --git a/.../test/resources/apimanager/merge-dir/apigateway/groups/emt-group/emt-service/conf/jvm.xml b/.../test/resources/apimanager/merge-dir/apigateway/groups/emt-group/emt-service/conf/jvm.xml