Refactored openresty-voms docker image

.gitlab-ci.yml

@@ -12,11 +12,9 @@ build-rpm:
     - env | sort
     - export VOMS_MODULE_HOME=${CI_PROJECT_DIR}
     - cd rpm && sh make_packaging.sh && cd ..
-    - mv ${HOME}/rpmbuild.tar.gz .
     - mv ${HOME}/rpmbuild ./rpmbuild
   artifacts:
     paths:
-      - rpmbuild.tar.gz
       - rpmbuild/SRPMS/
       - rpmbuild/RPMS/noarch/
       - rpmbuild/RPMS/x86_64/
@@ -32,12 +30,13 @@ docker-build-rpm:
     - apk add git bash
     - git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
     - cp helper-scripts/scripts/* /usr/local/bin
-    - cp rpmbuild/RPMS/x86_64/* ${CI_PROJECT_DIR}/docker/ngx-voms-packaging/
-    - cp rpmbuild/RPMS/noarch/* ${CI_PROJECT_DIR}/docker/ngx-voms-packaging/
+    - cp rpmbuild/RPMS/x86_64/* ${CI_PROJECT_DIR}/docker/openresty-voms/
+    - cp rpmbuild/RPMS/noarch/* ${CI_PROJECT_DIR}/docker/openresty-voms/ 
+    - rm ${CI_PROJECT_DIR}/docker/openresty-voms/*-debuginfo*.rpm
     - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
     - export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
     - export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
-    - cd docker && cd ngx-voms-packaging && build-docker-image.sh && push-docker-image.sh
+    - cd docker/openresty-voms && build-docker-image.sh && push-docker-image.sh
 
 push-to-dockerhub:
   stage: docker-push
@@ -55,9 +54,7 @@ push-to-dockerhub:
     - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
     - export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
     - export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
-    - cd docker && cd ngx-voms-packaging && pull-docker-image.sh && cd .. && unset DOCKER_REGISTRY_HOST
-    - docker login -u ${DOCKERHUB_USER} -p ${DOCKERHUB_PASSWORD}
-    - cd ngx-voms-packaging && push-docker-image.sh
+    - cd docker/openresty-voms && pull-docker-image.sh && unset DOCKER_REGISTRY_HOST
+    - docker login -u ${DOCKERHUB_USER} -p ${DOCKERHUB_PASSWORD} && push-docker-image.sh
   only:
     - master
-